Merge pull request #1006 from HSLdevcom/NitorCreations-tune-docker-build

Nitor creations tune docker build

Author: samuliheljo

Dockerfile

@@ -4,39 +4,41 @@ MAINTAINER Reittiopas version: 0.1
 EXPOSE 8080
 LABEL io.openshift.expose-services 8080:http
 
-# Where the app is built and run inside the docker fs
-ENV WORK=/opt/digitransit-ui
-
-# Used indirectly for saving npm logs etc.
-ENV HOME=/opt/digitransit-ui
-
-# App specific settings to override when the image is run
-ENV SENTRY_DSN=''
-ENV SENTRY_SECRET_DSN=''
-ENV PORT=8080
-ENV API_URL=''
-ENV MAP_URL=''
-ENV APP_PATH=''
-ENV CONFIG=''
-ENV PIWIK_ADDRESS=''
-ENV PIWIK_ID=''
-ENV NODE_ENV=''
+ENV \
+  # Where the app is built and run inside the docker fs \
+  WORK=/opt/digitransit-ui \
+  # Used indirectly for saving npm logs etc. \
+  HOME=/opt/digitransit-ui \
+  # App specific settings to override when the image is run \
+  SENTRY_DSN='' \
+  SENTRY_SECRET_DSN='' \
+  PORT=8080 \
+  API_URL='' \
+  MAP_URL='' \
+  APP_PATH='' \
+  CONFIG='' \
+  PIWIK_ADDRESS='' \
+  PIWIK_ID='' \
+  NODE_ENV=''
 
 WORKDIR ${WORK}
 ADD . ${WORK}
 
 # Build and set permissions for arbitary non-root users in OpenShift
 # (https://docs.openshift.org/latest/creating_images/guidelines.html#openshift-specific-guidelines)
-RUN npm install && \
+RUN \
+  npm install && \
   npm run static && \
   npm rebuild node-sass && \
   npm run build && \
+  rm -rf static docs test /tmp/* && \
+  npm prune --production && \
   npm cache clean && \
-  chmod -R a+rwX .
+  chmod -R a+rwX . && \
+  chown -R 9999:9999 ${WORK}
 
 # Don't run as root, because there's no reason to (https://docs.docker.com/engine/articles/dockerfile_best-practices/#user).
 # This also reveals permission problems on local Docker, before pushing to OpenShift.
-RUN chown -R 9999:9999 ${WORK}
 USER 9999
 
 CMD npm run start

app/server.js

@@ -42,8 +42,8 @@ function getStringOrArrayElement(arrayOrString, index) {
 // Look up paths for various asset files
 const appRoot = `${process.cwd()}/`;
 
-const svgSprite = fs.readFileSync(`${appRoot}static/svg-sprite.${config.CONFIG}.svg`).toString();
-const geolocationStarter = fs.readFileSync(`${appRoot}static/geolocation.js`).toString();
+const svgSprite = fs.readFileSync(`${appRoot}_static/svg-sprite.${config.CONFIG}.svg`).toString();
+const geolocationStarter = fs.readFileSync(`${appRoot}_static/geolocation.js`).toString();
 
 const networkLayer = new RelayNetworkLayer([
   urlMiddleware({

package.json

@@ -7,11 +7,11 @@
   "scripts": {
     "static": "mkdir -p _static/js; mkdir -p _static/css; cp -r static/* _static",
     "win-static": "xcopy static\\* _static /e /s /y /i& if not exist _static\\js mkdir _static\\js& if not exist _static\\css mkdir _static\\css",
+    "prestart": "npm run static",
+    "prewin-start": "npm run win-static",
     "predev": "npm run static",
     "predev-win-hsl": "npm run win-static",
     "predev-win-national": "npm run win-static",
-    "prestart": "npm run static",
-    "prewin-start": "npm run win-static",
     "dev": "PID=$$; trap 'pkill -QUIT -P $PID > /dev/null' EXIT; NODE_ENV=development nodemon -e js,css,scss,html --watch ./app/ server/server.js -x \"node --harmony\" & NODE_ENV=development forever -f start server/hotLoadServer.js",
     "dev-win-hsl": "cd win-launch-scripts&& hsl-win-launch-script.bat",
     "dev-win-national": "cd win-launch-scripts&& set CONFIG=&& national-win-launch-script.bat",