deploy

.gitea/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: Build & Deploy KLZ Cables
+name: Build & Deploy
 
 on:
   push:
@@ -10,33 +10,48 @@ jobs:
     runs-on: docker
 
     steps:
+      # --- Checkout ---
       - name: Checkout repo
         uses: actions/checkout@v3
 
+      # --- Tools ---
       - name: Install tools
         run: |
           apt-get update
-          apt-get install -y docker.io openssh-client
+          apt-get install -y \
+            docker.io \
+            openssh-client \
+            rsync
 
+      # --- Docker registry login ---
       - name: Login to registry
         env:
           REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
           REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }}
         run: |
-          echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me -u "$REGISTRY_USER" --password-stdin
+          echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me \
+            -u "$REGISTRY_USER" \
+            --password-stdin
 
+      # --- 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 }} \
+            -t registry.infra.mintel.me/mintel/mb-grid-solutions:latest .
-            --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} \
+          echo "Docker build completed successfully"
-            --build-arg NEXT_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
+          echo "Built image:"
-            -t registry.infra.mintel.me/mintel/klz-cables.com:latest .
+          docker images registry.infra.mintel.me/mintel/mb-grid-solutions:latest --format "table {{.Repository}}:{{.Tag}}\t{{.ID}}\t{{.CreatedSince}}"
 
+      # --- 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 successfully"
 
+      # --- SSH setup ---
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
@@ -44,67 +59,81 @@ jobs:
           chmod 600 ~/.ssh/id_ed25519
           ssh-keyscan -H alpha.mintel.me >> ~/.ssh/known_hosts
 
-      - name: Sync docker-compose file to server
+      # --- Sync files ---
+      - name: Sync files to server
         run: |
-          echo "Checking for docker-compose file..."
+          echo "Starting file sync to server..."
-
+          echo "Syncing docker-compose.yaml to alpha.mintel.me..."
-          COMPOSE_FILE=""
+          tar czf - docker-compose.yaml | \
-          if [ -f "docker-compose.yml" ]; then
+          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me \
-            COMPOSE_FILE="docker-compose.yml"
+          "mkdir -p /home/deploy/sites/mb-grid-solutions.com/ && tar xzf - -C /home/deploy/sites/mb-grid-solutions.com/ && echo 'Files synced successfully' && ls -la /home/deploy/sites/mb-grid-solutions.com/"
-          elif [ -f "docker-compose.yaml" ]; then
+          echo "File sync completed"
-            COMPOSE_FILE="docker-compose.yaml"
-          else
-            echo "ERROR: Keine docker-compose.yml oder .yaml gefunden!"
-            exit 1
-          fi
-
-          echo "Found and syncing: $COMPOSE_FILE"
-
-          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no deploy@alpha.mintel.me \
-            "mkdir -p /home/deploy/sites/klz-cables.com && chmod 775 /home/deploy/sites/klz-cables.com"
-
-          scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \
-            "$COMPOSE_FILE" \
-            deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/"$COMPOSE_FILE"
-
-          if [ -d "./varnish" ]; then
-            scp -r -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \
-              varnish/ deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/
-            echo "varnish synced"
-          fi
-
-          ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no deploy@alpha.mintel.me \
-            "chmod 664 /home/deploy/sites/klz-cables.com/$COMPOSE_FILE && \
-             ls -la /home/deploy/sites/klz-cables.com/ && \
-             stat /home/deploy/sites/klz-cables.com/$COMPOSE_FILE && \
-             echo 'Sync completed - using: $COMPOSE_FILE'"
 
+      # --- Deploy ---
       - name: Deploy on server
         env:
           REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
           REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }}
         run: |
+          echo "Starting deployment on server..."
           ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me "
             set -e
 
-            echo 'Logging in to registry...'
+            echo '=== Logging in to registry on server ==='
             echo \"\$REGISTRY_PASS\" | docker login registry.infra.mintel.me -u \"\$REGISTRY_USER\" --password-stdin
+            echo 'Registry login successful'
 
-            cd /home/deploy/sites/klz-cables.com || { echo 'Directory not found!'; exit 1; }
+            cd /home/deploy/sites/mb-grid-solutions.com || { echo 'Directory not found!'; exit 1; }
 
-            echo 'Creating .env...'
+            echo ''
-            echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > .env
+            echo '=== Current status before deploy ==='
+            docker compose ps -a || true
 
-            echo 'Pulling latest image...'
+            echo ''
-            docker compose pull app
+            echo '=== Current local image ==='
+            docker images registry.infra.mintel.me/mintel/mb-grid-solutions:latest --format 'table {{.Repository}}:{{.Tag}}\t{{.ID}}\t{{.CreatedSince}}' || echo 'No image found'
 
-            echo 'Force recreating app...'
+            echo ''
-            docker compose up -d --force-recreate app
+            echo '=== Pulling latest image (force) ==='
+            docker compose pull app || { echo 'Pull failed!'; exit 1; }
 
-            echo 'Pruning old images...'
+            echo ''
-            docker image prune -f --filter 'until=24h'
+            echo '=== Stopping and removing old containers ==='
+            docker compose down app --remove-orphans || true
+            docker compose rm -f app || true
 
-            echo 'Deployment finished. Status:'
+            echo ''
-            docker compose ps app
+            echo '=== Starting services with force-recreate and no-build ==='
-            docker compose logs --tail=20 app
+            docker compose up -d --pull always --force-recreate --no-build --no-deps app
+
+            echo ''
+            echo '=== Waiting for containers to become healthy (max 30s) ==='
+            for i in {1..6}; do
+              echo \"Attempt \$i/6...\"
+              if docker compose ps --format '{{.Status}}' | grep -q 'healthy'; then
+                echo 'All containers healthy!'
+                break
+              fi
+              sleep 5
+            done
+
+            echo ''
+            echo '=== Final status ==='
+            docker compose ps -a
+
+            echo ''
+            echo '=== Image now in use ==='
+            docker compose ps --format '{{.Name}}\t{{.Image}}\t{{.Status}}'
+
+            echo ''
+            echo '=== Last 40 lines of logs ==='
+            docker compose logs --tail=40 app || true
+
+            echo ''
+            echo '=== Pruning dangling & old images (keep last 24h) ==='
+            docker image prune -f --filter 'until=24h' || true
+
+            echo ''
+            echo '=== Deployment completed ==='
           "
+          echo "Deployment process finished"