From e6f7100bad45163acf15a84c2b2c92939482b158 Mon Sep 17 00:00:00 2001
From: Jon Buckley <jbuckley@mozilla.com>
Date: Fri, 14 Dec 2018 16:18:43 -0500
Subject: [PATCH] Upgrade to Node v10

---
 Dockerfile | 18 ++++++++++--------
 circle.yml |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 93f3a47b..41b3de80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,17 @@
-FROM node:8-alpine
+FROM node:10 AS builder
+RUN addgroup --gid 10001 app && adduser --disabled-password --gecos '' --gid 10001 --home /app --uid 10001 app
+COPY package*.json /app/
+WORKDIR /app
+RUN npm install --production
 
-RUN apk add --no-cache git
-RUN addgroup -S -g 10001 app && adduser -S -D -G app -u 10001 app
-COPY . /app
-RUN chown -R app /app
+FROM node:10-slim
+RUN addgroup --gid 10001 app && adduser --disabled-password --gecos '' --gid 10001 --home /app --uid 10001 app
 USER app
 WORKDIR /app
-RUN mkdir static
-RUN npm install --production && npm cache clean --force
+COPY --chown=app:app --from=builder /app .
+COPY --chown=app:app . .
 
 ENV PORT=1443
 EXPOSE $PORT
 
-CMD ["npm", "run", "prod"]
+CMD ["node", "server/prod.js"]
diff --git a/circle.yml b/circle.yml
index b1faac49..d10f691b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ version: 2.0
 jobs:
   build:
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
     steps:
       - checkout
       - restore_cache:
@@ -19,7 +19,7 @@ jobs:
             - ./dist
   test:
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:10-browsers
     steps:
       - checkout
       - restore_cache: