From 08201503858e751161df59f7be463c3e7eb855e4 Mon Sep 17 00:00:00 2001
From: Travis Shivers <ttshivers@gmail.com>
Date: Mon, 31 Aug 2020 19:05:56 -0500
Subject: [PATCH] build(docker): build once on BUILDPLATFORM

---
 Dockerfile     | 16 +++++++++-------
 Dockerfile.web |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d8b3ae15..f667ed3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,11 @@
-# base environment
-FROM node:current-alpine as base-stage
+# build environment
+FROM --platform=$BUILDPLATFORM base-stage as build-stage
 RUN mkdir /app && chown -R node:node /app
 WORKDIR /app
 RUN apk add --no-cache python make g++
 USER node
 COPY --chown=node:node package*.json ./
 RUN SKIP_BUILD=true npm ci
-
-
-# build environment
-FROM --platform=$BUILDPLATFORM base-stage as build-stage
 COPY --chown=node:node . .
 
 ARG VERSION
@@ -18,7 +14,13 @@ ARG REVISION
 RUN npm run build
 
 # dependency environment
-FROM base-stage as dependency-stage
+FROM node:current-alpine as dependency-stage
+RUN mkdir /app && chown -R node:node /app
+WORKDIR /app
+RUN apk add --no-cache python make g++
+USER node
+COPY --chown=node:node package*.json ./
+RUN SKIP_BUILD=true npm ci
 RUN npm prune --production
 
 # production environment
diff --git a/Dockerfile.web b/Dockerfile.web
index f5a66c02..866a26fe 100644
--- a/Dockerfile.web
+++ b/Dockerfile.web
@@ -2,6 +2,8 @@
 FROM --platform=$BUILDPLATFORM node:current-alpine as build-stage
 RUN mkdir /app && chown -R node:node /app
 WORKDIR /app
+RUN apk add --no-cache python make g++
+USER node
 COPY --chown=node:node package*.json ./
 RUN SKIP_BUILD=true npm ci
 COPY --chown=node:node . .