From 26953c6c134f130db4239917c3c90af1d6bad650 Mon Sep 17 00:00:00 2001
From: Collin Duncan <3679940+cgduncan7@users.noreply.github.com>
Date: Mon, 13 Feb 2023 15:49:48 +0100
Subject: [PATCH] Reoptimization of docker (perhaps)

---
 docker/server/Dockerfile | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 6c774cf..53da70a 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,6 +1,9 @@
-FROM node:18
+FROM node:18 as base
 LABEL org.opencontainers.image.source https://github.com/cgduncan7/autobaan
 
+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
@@ -12,12 +15,33 @@ USER node
 
 COPY --chown=node:node package.json package.json
 COPY --chown=node:node package-lock.json package-lock.json
-RUN CXX=g++-12 npm install argon2
+
+RUN CXX=g++-12 npm install --omit=dev
+
+FROM node:18 as builder
+
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium
-RUN npm install
 
+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 .
+
+USER node
+
+COPY --chown=node:node package.json package.json
+COPY --chown=node:node package-lock.json package-lock.json
 COPY --chown=node:node src src
 COPY --chown=node:node tsconfig.json tsconfig.json
+
+RUN CXX=g++-12 npm install
 RUN npm run build
+
+FROM base as app
+
+COPY --chown=node:node --from=builder /app/dist ./dist
+
 ENTRYPOINT node dist/server/index.js
\ No newline at end of file