Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

Dockerfile

@@ -1,13 +1,21 @@
-FROM costbase:2.0
+FROM costbase:2.0 as build
 
 RUN mv /home/ConstructionCost /home/YangHuCost
 
 WORKDIR /home/YangHuCost
 
-COPY . /home/YangHuCost
+COPY package.json /home/YangHuCost
 
 RUN cnpm install
 
+FROM base-alpine:latest
+
+COPY --from=build /home/YangHuCost /home/YangHuCost
+
+COPY . /home/YangHuCost
+
+WORKDIR /home/YangHuCost
+
 RUN gulp build
 
 ENV NODE_ENV=prod

package.json

@@ -52,7 +52,7 @@
     "node-xlsx": "^0.11.2",
     "pdfkit": "^0.8.2",
     "request-promise": "^4.2.5",
-    "socket.io": "^2.0.3",
+    "socket.io": "2.0.3",
     "ua-parser-js": "^0.7.14",
     "uuid": "^3.1.0",
     "wiredep": "^2.2.2"