From 5e76d07c1048fcf42a454bfe3a25d841724a4ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sch=C3=B6n?= <sschoen@acecom.de>
Date: Wed, 8 Jun 2022 02:45:52 +0200
Subject: [PATCH 1/2] added .git-folder to .dockerignore

---
 .dockerignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index 8615a470..fb85e2ca 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,9 @@
+/*.txt
+node_modules/
 .github/
 .vscode/
 docs/
+.git
 .gitignore
 .gitlab-ci.yml
 *.bat

From dc1b4f5ce2564551215ed484bf578aada01491ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sch=C3=B6n?= <sschoen@acecom.de>
Date: Wed, 8 Jun 2022 02:46:40 +0200
Subject: [PATCH 2/2] optimized Dockerfile for ci/cd pipelines

---
 docker/Dockerfile | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9245f270..2fc10d69 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,4 @@
-FROM node:current-alpine
-
-ARG INCLUDE_MONGODBTOOLS=""
+FROM node:current-alpine AS base
 
 #Add non-root user, add installation directories and assign proper permissions
 RUN mkdir -p /opt/meshcentral
@@ -9,19 +7,12 @@ RUN mkdir -p /opt/meshcentral
 WORKDIR /opt/meshcentral
 
 RUN apk add --no-cache bash
-RUN if [ "$INCLUDE_MONGODBTOOLS" == "yes" ] || [ "$INCLUDE_MONGODBTOOLS" == "YES" ]; then apk add --no-cache mongodb-tools; fi
+
+
+FROM base AS builder
 
 RUN mkdir /opt/meshcentral/meshcentral
 COPY ./ /opt/meshcentral/meshcentral/
-COPY ./docker/config.json.template /opt/meshcentral/config.json.template
-COPY ./docker/startup.sh startup.sh
-RUN rm -rf ./docker
-
-# install dependencies from package.json
-RUN cd meshcentral && npm install
-
-# install dependencies for plugins
-RUN cd meshcentral && npm install nedb
 
 # minify files - first try throws Error: Cannot find module 'jsdom'
 RUN cd meshcentral/translate && node translate.js minifyall; exit 0
@@ -31,6 +22,27 @@ RUN cd meshcentral/translate && node translate.js minifyall
 RUN cd meshcentral/translate && node translate.js translateall
 RUN cd meshcentral/translate && node translate.js extractall
 
+
+FROM base
+
+ARG INCLUDE_MONGODBTOOLS=""
+RUN if [ "$INCLUDE_MONGODBTOOLS" == "yes" ] || [ "$INCLUDE_MONGODBTOOLS" == "YES" ]; then apk add --no-cache mongodb-tools; fi
+
+# copy files from builder-image
+COPY --from=builder /opt/meshcentral/meshcentral /opt/meshcentral/meshcentral
+COPY --from=builder /opt/meshcentral/meshcentral/docker/startup.sh ./startup.sh
+COPY --from=builder /opt/meshcentral/meshcentral/docker/config.json.template /opt/meshcentral/config.json.template
+
+# cleanup
+RUN rm -rf /opt/meshcentral/meshcentral/docker
+RUN rm -rf /opt/meshcentral/meshcentral/node_modules
+
+# install dependencies from package.json
+RUN cd meshcentral && npm install
+
+# install dependencies for plugins
+RUN cd meshcentral && npm install nedb
+
 EXPOSE 80 443 4433
 
 # volumes