From e711835dfddeb394f6bd823ad739f45f26a006db Mon Sep 17 00:00:00 2001
From: Lars Gebhardt-Kusche <lars@kusche.berlin>
Date: Tue, 25 Nov 2025 22:57:24 +0100
Subject: [PATCH] new image

---
 .gitlab-ci.yml | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc37791..c336975 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,28 +5,27 @@ stages:
 # Globale Variablen
 # -----------------------------------------
 variables:
-  BASE_DIRS: "src public api partials"   # alle normalen Deploy-Verzeichnisse
-  CONFIG_BASE_DIR: "config"             # Basis-Konfigordner im Repo
+  BASE_DIRS: "src public api partials"
+  CONFIG_BASE_DIR: "config"
+
+# Standard-Image für alle Jobs
+default:
+  image: registry.int.kusche.berlin/usbcheck/ci-usbcheck-deploy:latest
 
 # -----------------------------------------
 # Deployment auf STAGING
 # -----------------------------------------
 deploy:staging:
   stage: deploy
-  image: alpine:3.20
 
   variables:
-    TARGET_PATH: "${FTP_PATH_STAGING}"   # z.B. staging/ oder /usbcheck/staging/
-    CONFIG_ENV_DIR: "config/staging"     # env-spezifische Config-Quelle
+    TARGET_PATH: "${FTP_PATH_STAGING}"
+    CONFIG_ENV_DIR: "config/staging"
 
   before_script:
-    - echo "📡 Installing lftp..."
-    - apk add --no-cache lftp
-
     - echo "📂 CI Workspace:"
     - pwd
     - ls -la
-
     - echo "📁 Prüfe & zeige Projektverzeichnisse:"
     - |
       for d in $BASE_DIRS $CONFIG_BASE_DIR $CONFIG_ENV_DIR; do
@@ -68,7 +67,6 @@ deploy:staging:
 
       echo "🚀 Deploy ${CI_ENVIRONMENT_NAME} → ${FTP_HOST}:${TARGET_PATH}"
 
-      # Dynamisches Syncen aller Verzeichnisse aus BASE_DIRS
       for d in $BASE_DIRS; do
         echo "🔁 Sync ${d}/ → ${TARGET_PATH}${d}/"
         lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "
@@ -81,14 +79,10 @@ deploy:staging:
         " || { echo "❌ Upload für Verzeichnis '${d}' fehlgeschlagen."; exit 1; }
       done
 
-      # ----------------------------------------------
-      # Gemischte Config bauen: config/*.php + config/staging/*
-      # ----------------------------------------------
       echo "🧩 Baue gemischtes Config-Verzeichnis (config/*.php + ${CONFIG_ENV_DIR})..."
       rm -rf .ci_config_deploy
       mkdir -p .ci_config_deploy
 
-      # 1) Basis: alle *.php direkt aus config/
       if [ -d "${CONFIG_BASE_DIR}" ]; then
         for f in ${CONFIG_BASE_DIR}/*.php; do
           if [ -f "$f" ]; then
@@ -98,7 +92,6 @@ deploy:staging:
         done
       fi
 
-      # 2) Env-spezifische Dateien darüberkopieren (dürfen Basis überschreiben)
       if [ -d "${CONFIG_ENV_DIR}" ]; then
         echo "➕ Env-Config aus ${CONFIG_ENV_DIR}/"
         cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/
@@ -131,16 +124,15 @@ deploy:staging:
 # -----------------------------------------
 deploy:production:
   stage: deploy
-  image: alpine:3.20
 
   variables:
     TARGET_PATH: "${FTP_PATH_PROD}"
     CONFIG_ENV_DIR: "config/prod"
 
   before_script:
-    - echo "📡 Installing lftp..."
-    - apk add --no-cache lftp
-
+    - echo "📂 CI Workspace:"
+    - pwd
+    - ls -la
     - echo "📁 Prüfe & zeige Projektverzeichnisse:"
     - |
       for d in $BASE_DIRS $CONFIG_BASE_DIR $CONFIG_ENV_DIR; do
@@ -194,14 +186,10 @@ deploy:production:
         " || { echo "❌ Upload für Verzeichnis '${d}' fehlgeschlagen."; exit 1; }
       done
 
-      # ----------------------------------------------
-      # Gemischte Config bauen: config/*.php + config/prod/*
-      # ----------------------------------------------
       echo "🧩 Baue gemischtes Config-Verzeichnis (config/*.php + ${CONFIG_ENV_DIR})..."
       rm -rf .ci_config_deploy
       mkdir -p .ci_config_deploy
 
-      # 1) Basis: alle *.php direkt aus config/
       if [ -d "${CONFIG_BASE_DIR}" ]; then
         for f in ${CONFIG_BASE_DIR}/*.php; do
           if [ -f "$f" ]; then
@@ -211,7 +199,6 @@ deploy:production:
         done
       fi
 
-      # 2) Env-spezifische Dateien darüberkopieren (dürfen Basis überschreiben)
       if [ -d "${CONFIG_ENV_DIR}" ]; then
         echo "➕ Env-Config aus ${CONFIG_ENV_DIR}/"
         cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/
@@ -236,4 +223,4 @@ deploy:production:
 
   only:
     - main
-  # when: manual   # optional wieder aktivierbar
+  # when: manual