Merge cdddf542c9 into e4fb3431fb

Dockerfile

@@ -1,9 +1,24 @@
-FROM node:alpine
+FROM node:alpine as builder
-MAINTAINER Alexander Kern <filepizza@kern.io>
+LABEL maintainer="Alexander Kern <filepizza@kern.io>"
+
+WORKDIR /root/filepizza
 
 COPY . ./
+
+# copy production node_modules aside
+RUN npm ci --only=production
+RUN cp -R node_modules prod_node_modules
+
 RUN npm install && npm run build
 
+FROM node:alpine
+LABEL maintainer="Alexander Kern <filepizza@kern.io>"
+WORKDIR /root/filepizza
+
+# copy production files
+COPY --from=builder /root/filepizza/prod_node_modules ./node_modules
+COPY --from=builder /root/filepizza/dist ./dist
+
 ENV NODE_ENV production
 EXPOSE 80
-CMD node ./dist/index.js
+ENTRYPOINT node ./dist/index.js

package.json

@@ -43,9 +43,8 @@
     "filepizza-socket": "^1.0.0",
     "newrelic": "^1.21.1",
     "nib": "^1.1.0",
-    "node-uuid": "^1.4.3",
+    "node-uuid": "^1.4.8",
-    "nodemon": "^1.4.1",
+    "react": "^0.13.3",
-    "react": "^0.13.0",
     "react-frozenhead": "^0.3.0",
     "react-google-analytics": "^0.2.0",
     "react-qr": "0.0.2",
@@ -67,13 +66,14 @@
     "babel-polyfill": "^6.16.0",
     "babel-preset-es2015": "^6.14.0",
     "babel-preset-stage-0": "^6.16.0",
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.28.11",
-    "json-loader": "^0.5.4",
+    "json-loader": "^0.5.7",
+    "nodemon": "^1.19.4",
     "noop-loader": "^1.0.0",
     "null-loader": "^0.1.1",
     "style-loader": "^0.18.2",
-    "stylus-loader": "^3.0.1",
+    "stylus-loader": "^3.0.2",
-    "webpack": "^1.12.14",
+    "webpack": "^1.15.0",
-    "webpack-dev-middleware": "^1.6.1"
+    "webpack-dev-middleware": "^1.12.2"
   }
 }