From 045a891ee73fbbe9f6c053a731f9a97cce622399 Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Wed, 21 Jan 2026 12:05:15 +0100
Subject: [PATCH] update

---
 .gitea/workflows/deploy.yml | 58 ++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 2969267..d63307f 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest   # ← FIX: Offizieller Runner, Docker ist vorinstalliert
+    runs-on: ubuntu-latest   # ← FIX: Offizieller Runner mit Docker vorinstalliert
 
     steps:
       # --- Checkout ---
@@ -27,16 +27,18 @@ jobs:
       # --- Build image ---
       - name: Build image
         run: |
+          echo "Starting Docker build"
           docker build \
-            --pull \
-            --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} \
-            --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} \
-            --build-arg NEXT_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
-            -t registry.infra.mintel.me/mintel/klz-cables.com:latest .
+            -t registry.infra.mintel.me/mintel/mb-grid-solutions:latest .
+          echo "Docker build completed"
+          docker images registry.infra.mintel.me/mintel/mb-grid-solutions:latest --format "Built image ID: {{.ID}}"
 
       # --- Push image ---
       - name: Push image
-        run: docker push registry.infra.mintel.me/mintel/klz-cables.com:latest
+        run: |
+          echo "Starting Docker push"
+          docker push registry.infra.mintel.me/mintel/mb-grid-solutions:latest
+          echo "Docker push completed"
 
       # --- SSH setup ---
       - name: Setup SSH
@@ -49,9 +51,11 @@ jobs:
       # --- Sync files ---
       - name: Sync files to server
         run: |
-          tar czf - docker-compose.yml | \
-          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no deploy@alpha.mintel.me \
-          "mkdir -p /home/deploy/sites/klz-cables.com/ && tar xzf - -C /home/deploy/sites/klz-cables.com/"
+          echo "Starting file sync to server"
+          tar czf - docker-compose.y*ml | \
+          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 -o ConnectTimeout=30 deploy@alpha.mintel.me \
+          "mkdir -p /home/deploy/sites/mb-grid-solutions/ && tar xzvf - -C /home/deploy/sites/mb-grid-solutions/ && echo 'Files synced successfully' && ls -la /home/deploy/sites/mb-grid-solutions/"
+          echo "File sync completed"
 
       # --- Deploy ---
       - name: Deploy on server
@@ -59,14 +63,28 @@ jobs:
           REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
           REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }}
         run: |
-          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no deploy@alpha.mintel.me "
-            set -e
-            echo '$REGISTRY_PASS' | docker login registry.infra.mintel.me -u '$REGISTRY_USER' --password-stdin
-            cd /home/deploy/sites/klz-cables.com
-            echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > .env
-            docker compose pull app
-            docker compose up -d --force-recreate --no-deps app
+          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 -o ConnectTimeout=30 deploy@alpha.mintel.me "
+            set -ex
+
+            echo 'Logging in to registry on server...'
+            printf '%s\n' '$REGISTRY_PASS' | docker login registry.infra.mintel.me -u '$REGISTRY_USER' --password-stdin
+            echo 'Login successful'
+
+            cd /home/deploy/sites/mb-grid-solutions
+            echo 'Changed to directory: $(pwd)'
+            ls -la
+
+            echo 'Pulling latest image...'
+            docker compose pull || echo 'Pull failed - continuing anyway...'
+
+            echo 'Force recreating and restarting containers...'
+            docker compose up -d --force-recreate --no-deps
+
+            echo 'Pruning old images (keep last 24h)...'
             docker image prune -f --filter 'until=24h'
-            docker compose ps app
-            docker compose logs --tail=20 app
-          "
\ No newline at end of file
+
+            echo 'Deployment finished. Checking status...'
+            docker compose ps
+            docker compose logs --tail=20
+          "
+          echo "SSH deploy completed"
\ No newline at end of file