From 7a079de3a6e6a598d50e7698b62b09f85d0dd0f2 Mon Sep 17 00:00:00 2001
From: Mirco <mirco.zachmann@meissa.de>
Date: Thu, 21 Dec 2023 21:23:40 +0100
Subject: [PATCH] Improvements docker image building

---
 .gitlab-ci.yml                                             | 6 +++---
 infrastructure/excalidraw-backend/image/Dockerfile         | 4 ++--
 .../excalidraw-backend/image/resources/install.sh          | 7 +++----
 infrastructure/web/image/Dockerfile                        | 2 +-
 infrastructure/web/image/resources/install.sh              | 7 +++----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fff85dd..249ef01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
   - image
 
 .img: &img
-  image: "domaindrivenarchitecture/ddadevops-dind:4.10.0"
+  image: "domaindrivenarchitecture/ddadevops-dind:4.10.5"
   services:
     - docker:dind
   before_script:
@@ -16,7 +16,7 @@ stages:
   - export IMAGE_TAG=$CI_COMMIT_TAG
 
 .cljs-job: &cljs
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.0"
+  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
@@ -29,7 +29,7 @@ stages:
   - npm install
 
 .clj-job: &clj
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.0"
+  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
diff --git a/infrastructure/excalidraw-backend/image/Dockerfile b/infrastructure/excalidraw-backend/image/Dockerfile
index 65b92c1..8c26627 100644
--- a/infrastructure/excalidraw-backend/image/Dockerfile
+++ b/infrastructure/excalidraw-backend/image/Dockerfile
@@ -3,9 +3,9 @@ FROM node:20.10.0-bookworm-slim
 
 WORKDIR /excalidraw-backend
 
-COPY resources/package.json resources/package-lock.json resources/tsconfig.json resources/install.sh resources/src resources/install_functions.sh ./
+COPY resources/package.json resources/package-lock.json resources/tsconfig.json resources/install.sh resources/src ./
 
-RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes ./install.sh
+RUN ./install.sh
 
 EXPOSE 80
 EXPOSE 9090
diff --git a/infrastructure/excalidraw-backend/image/resources/install.sh b/infrastructure/excalidraw-backend/image/resources/install.sh
index 3ca15fe..5952d3a 100755
--- a/infrastructure/excalidraw-backend/image/resources/install.sh
+++ b/infrastructure/excalidraw-backend/image/resources/install.sh
@@ -3,15 +3,14 @@ set -exo pipefail
 
 function main() {
     {
-        apt-get update
-        apt-get -qqy upgrade
+        upgradeSystem
     } > /dev/null
     
     cleanupDocker
 }
 
-source ./install_functions.sh
-main
+source ./install_functions_debian.sh
+DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main
 
 npm ci --omit=dev
 npm run build
diff --git a/infrastructure/web/image/Dockerfile b/infrastructure/web/image/Dockerfile
index 451d869..92bb39f 100644
--- a/infrastructure/web/image/Dockerfile
+++ b/infrastructure/web/image/Dockerfile
@@ -2,4 +2,4 @@ FROM jitsi/web:stable-9111
 
 # Prepare Configuration
 ADD resources /tmp
-RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh
+RUN /tmp/install.sh
diff --git a/infrastructure/web/image/resources/install.sh b/infrastructure/web/image/resources/install.sh
index e78b2b1..696a6be 100755
--- a/infrastructure/web/image/resources/install.sh
+++ b/infrastructure/web/image/resources/install.sh
@@ -4,8 +4,7 @@ set -exo pipefail
 
 function main() {
     {
-        apt-get update
-        apt-get -qqy upgrade 
+        upgradeSystem
     } > /dev/null
 
     install -m 0700 /tmp/install-debug.sh /usr/local/bin/
@@ -14,5 +13,5 @@ function main() {
     cleanupDocker
 }
 
-source /tmp/install_functions.sh
-main
\ No newline at end of file
+source /tmp/install_functions_debian.sh
+DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main
\ No newline at end of file