Dockerpush fix docker use base builder run npm ls production (#579)

.circleci/config.yml

@@ -31,6 +31,10 @@ jobs:
           name: Build deployment container image
           command: docker build -f Dockerfile-build -t fxa-oauth-server:build .
 
+      - run:
+          name: Check npm install
+          command: docker run --rm -it fxa-oauth-server:build npm ls --production
+
       - run:
           name: Build test container image
           command: docker build -f Dockerfile-test -t fxa-oauth-server:test .

Dockerfile-build

@@ -1,8 +1,9 @@
-FROM node:8-alpine
+FROM node:8-alpine AS builder
 
 RUN npm install -g npm@6 && rm -rf ~app/.npm /tmp/*
 
-RUN apk add --no-cache git
+RUN apk add --no-cache git && \
+    apk add --repository http://dl-cdn.alpinelinux.org/alpine/v3.5/community/ --no-cache --virtual .build-deps git python make g++
 
 RUN addgroup -g 10001 app && \
     adduser -D -G app -h /app -u 10001 app
@@ -22,3 +23,24 @@ COPY scripts/gen_keys.js scripts/gen_keys.js
 RUN npm install --production && rm -rf ~app/.npm /tmp/*
 
 COPY . /app
+
+
+# Build final image by copying from builder
+FROM node:8-alpine
+
+RUN npm install -g npm@6 && rm -rf ~app/.npm /tmp/*
+
+RUN apk add --no-cache git
+
+RUN addgroup -g 10001 app && \
+    adduser -D -G app -h /app -u 10001 app
+WORKDIR /app
+
+# S3 bucket in Cloud Services prod IAM
+ADD https://s3.amazonaws.com/dumb-init-dist/v1.2.0/dumb-init_1.2.0_amd64 /usr/local/bin/dumb-init
+RUN chmod +x /usr/local/bin/dumb-init
+ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
+
+USER app
+
+COPY --from=builder --chown=app /app/ /app/

Dockerfile-test

@@ -1,2 +1,5 @@
 FROM fxa-oauth-server:build
+USER root
+RUN apk add --repository http://dl-cdn.alpinelinux.org/alpine/v3.5/community/ --no-cache --virtual .build-deps git python make g++
+USER app
 RUN npm install