From 5b5249eb5534d235e6e1b38a198c5a2001f59c9a Mon Sep 17 00:00:00 2001
From: Mirco <mirco.zachmann@meissa.de>
Date: Fri, 15 Dec 2023 17:21:43 +0100
Subject: [PATCH] usage of install_functions_debian/alpine.sh

---
 .gitlab-ci.yml                                      |  4 ++--
 infrastructure/clj-cljs/image/resources/install.sh  |  2 +-
 infrastructure/clj/image/resources/install.sh       |  2 +-
 infrastructure/ddadevops/image/resources/install.sh | 12 ++++++------
 infrastructure/dind/image/resources/install.sh      | 13 ++++++-------
 infrastructure/kotlin/image/resources/install.sh    |  2 +-
 infrastructure/python/image/resources/install.sh    | 12 ++++++------
 7 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49cf48e..ef60fbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,14 +4,14 @@ stages:
   - image
 
 .py: &py
-  image: "domaindrivenarchitecture/ddadevops-python:4.10.0"
+  image: "domaindrivenarchitecture/ddadevops-python:4.10.2"
   before_script:
     - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
     - python --version
     - pip install -r requirements.txt
 
 .img: &img
-  image: "domaindrivenarchitecture/ddadevops-dind:4.10.0"
+  image: "domaindrivenarchitecture/ddadevops-dind:4.10.2"
   services:
     - docker:dind
   before_script:
diff --git a/infrastructure/clj-cljs/image/resources/install.sh b/infrastructure/clj-cljs/image/resources/install.sh
index a66f796..4e6b5c0 100755
--- a/infrastructure/clj-cljs/image/resources/install.sh
+++ b/infrastructure/clj-cljs/image/resources/install.sh
@@ -44,5 +44,5 @@ function checksum() {
     fi
 }
 
-source /tmp/install_functions.sh
+source /tmp/install_functions_debian.sh
 DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main
\ No newline at end of file
diff --git a/infrastructure/clj/image/resources/install.sh b/infrastructure/clj/image/resources/install.sh
index e2d5ac7..ce1703f 100755
--- a/infrastructure/clj/image/resources/install.sh
+++ b/infrastructure/clj/image/resources/install.sh
@@ -54,5 +54,5 @@ function checksum() {
     fi
 }
 
-source /tmp/install_functions.sh
+source /tmp/install_functions_debian.sh
 DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main
\ No newline at end of file
diff --git a/infrastructure/ddadevops/image/resources/install.sh b/infrastructure/ddadevops/image/resources/install.sh
index f9ed593..a6106d2 100755
--- a/infrastructure/ddadevops/image/resources/install.sh
+++ b/infrastructure/ddadevops/image/resources/install.sh
@@ -4,16 +4,16 @@ set -exo pipefail
 
 function main() {
     {
-        #upgradeSystem
-        apk -U upgrade
+        upgradeSystem
+        
         apk add --no-cache python3 py3-pip openssl-dev bash git curl
         python3 -m pip install -U pip
         pip3 install pybuilder ddadevops deprecation dda-python-terraform boto3 pyyaml inflection
-        #cleanupDocker
-        apk cache clean
-        rm -rf /tmp/*
+        
+        cleanupDocker
+        
     } > /dev/null
 }
 
-#source /tmp/install_functions_alpine.sh
+source /tmp/install_functions_alpine.sh
 main
diff --git a/infrastructure/dind/image/resources/install.sh b/infrastructure/dind/image/resources/install.sh
index 1325232..565f354 100755
--- a/infrastructure/dind/image/resources/install.sh
+++ b/infrastructure/dind/image/resources/install.sh
@@ -4,15 +4,14 @@ set -exo pipefail
 
 function main() {
     {
-        #upgradeSystem
-        apk -U upgrade
+        upgradeSystem
+        
         apk add --no-cache python3 py3-pip openssl-dev bash git
-        pip3 --break-system-packages install pybuilder ddadevops deprecation dda-python-terraform boto3 pyyaml inflection
-        #cleanupDocker
-        apk cache clean
-        rm -rf /tmp/*
+        pip3 install --break-system-packages pybuilder ddadevops deprecation dda-python-terraform boto3 pyyaml inflection
+        
+        cleanupDocker        
     } > /dev/null
 }
 
-#source /tmp/install_functions_alpine.sh
+source /tmp/install_functions_alpine.sh
 main
diff --git a/infrastructure/kotlin/image/resources/install.sh b/infrastructure/kotlin/image/resources/install.sh
index dd01a61..6c426c6 100755
--- a/infrastructure/kotlin/image/resources/install.sh
+++ b/infrastructure/kotlin/image/resources/install.sh
@@ -13,5 +13,5 @@ function main() {
     } > /dev/null
 }
 
-source /tmp/install_functions.sh
+source /tmp/install_functions_debian.sh
 DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main
\ No newline at end of file
diff --git a/infrastructure/python/image/resources/install.sh b/infrastructure/python/image/resources/install.sh
index d57bd24..d6faf4c 100755
--- a/infrastructure/python/image/resources/install.sh
+++ b/infrastructure/python/image/resources/install.sh
@@ -4,17 +4,17 @@ set -exo pipefail
 
 function main() {
     {
-        #upgradeSystem
-        apk -U upgrade
+        upgradeSystem
+        
         apk add --no-cache build-base rust python3 python3-dev py3-pip py3-setuptools py3-wheel libffi-dev openssl-dev cargo bash git curl
         python3 -m pip install -U pip
         pip3 install pybuilder ddadevops deprecation dda-python-terraform boto3 pyyaml inflection \
                 coverage flake8 flake8-polyfill mypy mypy-extensions pycodestyle pyflakes pylint pytest pytest-cov pytest-datafiles types-setuptools types-PyYAML
-        #cleanupDocker
-        apk cache clean
-        rm -rf /tmp/*
+        
+        cleanupDocker
+        
     } > /dev/null
 }
 
-#source /tmp/install_functions_alpine.sh
+source /tmp/install_functions_alpine.sh
 main