- Added npm install --production step to Dockerfile

- Removed `npm prune` step from build dockerfile
- added `node_modules` back into dockerignore

.dockerignore

@@ -6,6 +6,7 @@ docs
 .sass-lint.yml
 CONTRIBUTING.md
 env.sh
+node_modules
 node_modules_local
 docker/build_and_test.Dockerfile
 Dockerfile

Dockerfile

@@ -2,12 +2,17 @@ FROM node:6.11.1-alpine
 
 RUN apk update &&\
     apk upgrade &&\
-    apk add --update bash libc6-compat
+    apk add --update bash python make g++ libc6-compat
 
 ENV PORT 9000
 EXPOSE 9000
 
+ADD package.json /tmp/package.json
+RUN cd /tmp && npm install --production
+
 WORKDIR /app
 ADD . /app
 
+RUN cp -a /tmp/node_modules /app/
+
 CMD npm start

build-local.sh

@@ -1,21 +1,4 @@
 #!/bin/bash
 
-if [ -d "node_modules_local" ]; then
-    rm -rf node_modules_local
-fi
-
-if [ -d "node_modules" ]; then
-  mv node_modules node_modules_local
-fi
-
-docker build --file docker/build_and_test.Dockerfile -t govukpay/selfservice-build:local . &&\
-docker run --volume $(pwd):/app:rw govukpay/selfservice-build:local &&\
-docker build -t govukpay/selfservice:local .
-
-if [ -d "node_modules" ]; then
-  rm -rf node_modules
-fi
-
-if [ -d "node_modules_local" ]; then
-  mv node_modules_local node_modules
-fi
+npm install && npm run compile &&\
+docker build -t govukpay/selfservice:local .

docker/build_and_test.sh

@@ -9,5 +9,4 @@ grep -rnw './test' -e 'context.only' && echo '' && echo 'ERROR: context.only() f
 mkdir -p /app &&\
 cp -a /tmp/node_modules /app/ &&\
 npm run compile &&\
-npm test &&\
-npm prune --production
+npm test