From cdd5e3821725a125a9a2f36aa9b493fb7d44113c Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Wed, 21 Jan 2026 12:17:44 +0100
Subject: [PATCH] deploy

---
 .gitea/workflows/deploy.yml | 42 +++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 361d6ec..be7ed0a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -36,17 +36,19 @@ 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/mb-grid-solutions.com:latest .
+          echo "Docker build completed"
+          docker images registry.infra.mintel.me/mintel/mb-grid-solutions.com:latest --format "Built image ID: {{.ID}}"
 
       # --- Push image ---
       - name: Push image
         run: |
+          echo "Starting Docker push"
           docker push registry.infra.mintel.me/mintel/mb-grid-solutions.com:latest
+          echo "Docker push completed"
 
       # --- SSH setup ---
       - name: Setup SSH
@@ -59,9 +61,11 @@ jobs:
       # --- Sync files ---
       - name: Sync files to server
         run: |
+          echo "Starting file sync to server"
           tar czf - docker-compose.yaml | \
           ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me \
-          "mkdir -p /home/deploy/sites/mb-grid-solutions.com/ && tar xzf - -C /home/deploy/sites/mb-grid-solutions.com/"
+          "mkdir -p /home/deploy/sites/mb-grid-solutions.com/ && tar xzf - -C /home/deploy/sites/mb-grid-solutions.com/ && echo 'Files synced' && ls -la /home/deploy/sites/mb-grid-solutions.com/"
+          echo "File sync completed"
 
       # --- Deploy ---
       - name: Deploy on server
@@ -70,32 +74,34 @@ jobs:
           REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }}
         run: |
           ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me "
-            set -e
+            set -ex
 
             echo 'Logging in to registry on server...'
             echo '$REGISTRY_PASS' | docker login registry.infra.mintel.me -u '$REGISTRY_USER' --password-stdin
 
             cd /home/deploy/sites/mb-grid-solutions.com
 
-            echo 'Creating .env if needed...'
-            echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > .env
-            echo 'SMTP_HOST=${{ secrets.SMTP_HOST }}' >> .env
-            echo 'SMTP_PORT=${{ secrets.SMTP_PORT }}' >> .env
-            echo 'SMTP_USER=${{ secrets.SMTP_USER }}' >> .env
-            echo 'SMTP_PASS=${{ secrets.SMTP_PASS }}' >> .env
-            echo 'SMTP_FROM=${{ secrets.SMTP_FROM }}' >> .env
-            echo 'CONTACT_RECIPIENT=${{ secrets.CONTACT_RECIPIENT }}' >> .env
+            echo 'Creating .env...'
+            cat > .env << EOF
+SENTRY_DSN=${{ secrets.SENTRY_DSN }}
+SMTP_HOST=${{ secrets.SMTP_HOST }}
+SMTP_PORT=${{ secrets.SMTP_PORT }}
+SMTP_USER=${{ secrets.SMTP_USER }}
+SMTP_PASS=${{ secrets.SMTP_PASS }}
+SMTP_FROM=${{ secrets.SMTP_FROM }}
+CONTACT_RECIPIENT=${{ secrets.CONTACT_RECIPIENT }}
+EOF
 
             echo 'Pulling latest image...'
-            docker compose pull || echo 'Pull failed - continuing anyway...'
+            docker compose pull || echo 'Pull failed - continuing...'
 
             echo 'Force recreating and restarting app container...'
-            docker compose up -d --force-recreate --no-deps app   # ← HIER DER FIX
+            docker compose up -d --force-recreate --no-deps app
 
-            echo 'Pruning old images (keep last 24h)...'
+            echo 'Pruning old images...'
             docker image prune -f --filter 'until=24h'
 
-            echo 'Deployment finished. Checking status...'
+            echo 'Deployment finished. Status & logs:'
             docker compose ps app
-            docker compose logs --tail=20 app
+            docker compose logs --tail=30 app
           "
\ No newline at end of file