Fixed: #27

Author: Molunerfinn

.dockerignore

@@ -0,0 +1,7 @@
+.git
+.gitignore
+README.md
+docker-compose.yml
+node_modules/
+dist/
+test/

Dockerfile

@@ -0,0 +1,4 @@
+FROM node:carbon-alpine
+WORKDIR /www 
+COPY . /www
+RUN npm install

README.md

@@ -60,6 +60,8 @@ PORT=8888
 
 ### Run
 
+> Node.js & Docker support. **You need to create a `.env` file as above**.
+
 ### Node.js
 
 Beacuse of using Koa2, `Node.js >= v7.6.0` is needed.
@@ -74,7 +76,7 @@ open browser: `localhost:8080`
 
 #### Production:
 
-`npm run build` and then `npm run server`
+`npm run start` 
 
 open browser: `localhost:8889`
 
@@ -84,6 +86,16 @@ open browser: `localhost:8889`
 
 `npm run test` and find the coverage report in the `coverage/lcov/index.html`
 
+### Docker
+
+`docker-compose build` && `docker-compose up`
+
+> mysql in docker use 3306 port inside & outside.
+
+open browser: `localhost:8889`
+
+> tips: login password is 123
+
 ## License
 
 [MIT](http://opensource.org/licenses/MIT)

docker-compose.yml

@@ -0,0 +1,41 @@
+version: "3"
+
+volumes:
+  mysqlstorage:
+
+services:
+  node:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+      - ./.env
+    volumes:
+      - ./:/www
+    ports:
+      - ${PORT}:${PORT}
+    command: "npm run start"
+    environment:
+      DB_URL: mysql
+    links:
+      - mysql
+    depends_on:
+      - mysql
+  
+  mysql:
+    image: 'mysql:5.7'
+    env_file:
+      - ./.env
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+      MYSQL_USER: ${DB_USER}
+    build:
+      context: .
+      dockerfile: mysql.dockerfile
+      args:
+        MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+    restart: always
+    volumes:
+      - mysqlstorage:/data/db
+    ports:
+      - "3306:3306"

init_db.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+mysql -u$MYSQL_USER -p$MYSQL_ROOT_PASSWORD <<EOF
+source $WORK_PATH/$FILE_0;
+source $WORK_PATH/$FILE_1;

mysql.dockerfile

@@ -0,0 +1,18 @@
+FROM mysql:5.7
+LABEL maintainer="Molunerfinn <[email protected]>"
+ARG MYSQL_ROOT_PASSWORD
+ARG MYSQL_USER
+
+ENV MYSQL_ROOT_PASSWORD $MYSQL_ROOT_PASSWORD
+ENV MYSQL_USER $MYSQL_USER
+ENV WORK_PATH /usr/local/db
+ENV FILE_0 list.sql
+ENV FILE_1 user.sql
+USER root
+
+WORKDIR $WORK_PATH/
+
+COPY ./sql/*.sql $WORK_PATH/
+COPY ./init_db.sh /docker-entrypoint-initdb.d/init_db.sh
+
+RUN chmod a+x /docker-entrypoint-initdb.d/init_db.sh

package.json

@@ -10,7 +10,9 @@
     "server": "nodemon -w app.js -w server server-entry.js",
     "test": "cross-env NODE_ENV=test jest --forceExit --runInBand",
     "coverage": "cat ./coverage/lcov.info | coveralls",
-    "start": "cross-env NODE_ENV=production pm2 start pm2.json"
+    "prod": "cross-env NODE_ENV=production node server-entry.js",
+    "start": "npm run build && npm run prod",
+    "start:pm2": "cross-env NODE_ENV=production pm2 start pm2.json"
   },
   "dependencies": {
     "axios": "^0.15.3",
@@ -31,10 +33,10 @@
     "stylus-loader": "^2.4.0",
     "supertest": "^3.0.0",
     "vue": "2.5.2",
-    "vue-jest": "^1.0.3",
     "vue-router": "^2.3.1"
   },
   "devDependencies": {
+    "@vue/test-utils": "^1.0.0-beta.12",
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
     "babel-eslint": "^7.1.1",
@@ -79,10 +81,11 @@
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "url-loader": "^0.5.8",
+    "vue-jest": "^2.3.0",
     "vue-loader": "^13.3.0",
+    "vue-server-renderer": "^2.5.16",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "2.5.2",
-    "vue-test-utils": "^1.0.0-beta.4",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-middleware": "^1.12.0",

server/config/db.js

@@ -1,7 +1,7 @@
 import '../../env'
 import Sequelize from 'sequelize'
 
-const Todolist = new Sequelize(`mysql://${process.env.DB_USER}:${process.env.DB_PASSWORD}@localhost/todolist`, {
+const Todolist = new Sequelize(`mysql://${process.env.DB_USER}:${process.env.DB_PASSWORD}@${process.env.DB_URL || 'localhost'}/todolist`, {
   define: {
     timestamps: false // 取消Sequelzie自动给数据表加入时间戳（createdAt以及updatedAt）
   }

test/client/login.spec.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import elementUI from 'element-ui'
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import Login from '../../src/components/Login.vue'
 import axios from 'axios'
 

test/client/todolist.spec.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import elementUI from 'element-ui'
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import Todolist from '../../src/components/Todolist.vue'
 import axios from 'axios'