From 9380533518265b3c16e1354f9cc83181af75af87 Mon Sep 17 00:00:00 2001
From: Collin Duncan <3679940+cgduncan7@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:18:36 +0200
Subject: [PATCH] Dockerfile fixes

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

diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index b9030f7..110c36b 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,24 +1,4 @@
-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
-
-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
-
-RUN CXX=g++-12 npm install --omit=dev
-
-FROM node:18 as builder
+FROM node:18 as app
 
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium
@@ -40,10 +20,6 @@ COPY --chown=node:node tsconfig.build.json tsconfig.build.json
 COPY --chown=node:node tsconfig.json tsconfig.json
 
 RUN CXX=g++-12 npm install
-RUN npm run migrations:run
-ENTRYPOINT [ "npm", "run", "start" ]
-
-FROM base as app
 
 ARG PORT=3000
 ENV PORT=$PORT
@@ -54,6 +30,5 @@ ENV REDIS_HOST=$REDIS_HOST
 ARG REDIS_PORT=6379
 ENV REDIS_PORT=$REDIS_PORT
 
-COPY --chown=node:node --from=builder /app/dist ./dist
-
+RUN npm run migrations:run
 ENTRYPOINT ["npm", "run", "start"]
\ No newline at end of file