From 996262bd96ee91601b3aed107ebc2f75e67cb2a6 Mon Sep 17 00:00:00 2001
From: DrJume <DrJume@users.noreply.github.com>
Date: Fri, 28 Aug 2020 07:39:28 +0200
Subject: [PATCH] fix Dockerfile and remove old

---
 Dockerfile     |  4 ++--
 Dockerfile.old | 23 -----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 Dockerfile.old

diff --git a/Dockerfile b/Dockerfile
index 079a845..42d4bde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm ci --only=production
 
-COPY src/ src/
+COPY . .
 
 COPY --from=frontend /build/dist/ src/frontend/dist/
 
@@ -33,4 +33,4 @@ EXPOSE 3000
 
 VOLUME /app/share/
 
-CMD [ "npx", "pm2-runtime", "--raw", "src/pm2.config.js" ]
+CMD [ "npx", "pm2-runtime", "--raw", "pm2.config.js" ]
diff --git a/Dockerfile.old b/Dockerfile.old
deleted file mode 100644
index 83d7e43..0000000
--- a/Dockerfile.old
+++ /dev/null
@@ -1,23 +0,0 @@
-# Supported architectures amd64, arm32v7, arm64v8
-ARG ARCH=amd64
-FROM ${ARCH}/node:12-slim
-
-# Create app directory
-WORKDIR /app
-
-# Install app dependencies
-# A wildcard is used to ensure both package.json AND package-lock.json are copied
-COPY package*.json ./
-RUN npm ci --only=production
-
-# Bundle app source
-COPY . .
-
-# RUN npm config set unsafe-perm true NOT NEEDED
-RUN cd frontend/ && npm ci && npm run build
-RUN npm install pm2 -g
-
-# Expose internal port defined in Config.dev.internal_port
-EXPOSE 3000
-
-CMD [ "pm2-runtime", "--raw", "pm2.config.js" ]