From c0a8e61187fa2392f333852957d0f13c5437973c Mon Sep 17 00:00:00 2001
From: Collin Duncan <3679940+cgduncan7@users.noreply.github.com>
Date: Mon, 13 Feb 2023 08:25:58 +0100
Subject: [PATCH] Updating dockerfile to ensure that chromium is part of app
 image

---
 docker/server/Dockerfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index d10a121..1bbceae 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,11 +1,10 @@
 FROM node:18 as builder
+
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y gcc chromium fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
-RUN npm i -g node-gyp
 RUN chown -R node:node .
 
 USER node
@@ -23,19 +22,23 @@ FROM node:18 as dependencies
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium
 
+RUN apt-get update && apt-get install -y gcc chromium fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
+RUN npm i -g node-gyp
+
 WORKDIR /app
+RUN chown -R node:node .
 
 COPY --chown=node:node package.json package.json
 COPY --chown=node:node package-lock.json package-lock.json
+
+USER node
+
 RUN CXX=g++-12 npm install --omit=dev
 
-FROM node:18 as app
+FROM dependencies as app
 LABEL org.opencontainers.image.source https://github.com/cgduncan7/autobaan
 
-WORKDIR /app
-
 COPY --from=builder /app/dist ./dist
-COPY --from=dependencies /app/node_modules ./node_modules
 
 EXPOSE 3000
 ENTRYPOINT node dist/server/index.js
\ No newline at end of file