refactor: Simplify CI/CD pipeline for reliability

- Removed REPO_PATH workaround (use checkout directly) - Simplified env vars with global definitions - Fixed network names as env vars - Updated DATABASE_URL in Gitea secrets - Cleaner deployment steps - Better health checks
2025-12-21 15:03:43 +01:00
parent ddb1a26d47
commit 380c0313d9
1 changed files with 39 additions and 78 deletions
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@ -5,6 +5,13 @@ on:
    branches:
      - main

+env:
+  BACKEND_IMAGE: pounce-backend
+  FRONTEND_IMAGE: pounce-frontend
+  # Networks
+  SUPABASE_NETWORK: n0488s44osgoow4wgo04ogg0
+  COOLIFY_NETWORK: coolify
+
 jobs:
  build-and-deploy:
    runs-on: ubuntu-latest
@ -12,41 +19,22 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v4

-      - name: Set up environment
-        run: |
-          echo "REPO_PATH=/home/administrator/pounce" >> $GITHUB_ENV
-          echo "BACKEND_IMAGE=pounce-backend" >> $GITHUB_ENV
-          echo "FRONTEND_IMAGE=pounce-frontend" >> $GITHUB_ENV
-
-      - name: Sync code to deploy directory
-        run: |
-          mkdir -p ${{ env.REPO_PATH }}
-          cp -r . ${{ env.REPO_PATH }}/
-          echo "Code synced to ${{ env.REPO_PATH }}"
-
      - name: Build Backend Docker Image
        run: |
-          cd ${{ env.REPO_PATH }}/backend
-          docker build -t ${{ env.BACKEND_IMAGE }}:${{ github.sha }} -t ${{ env.BACKEND_IMAGE }}:latest .
-          echo "✅ Backend image built successfully"
+          cd backend
+          docker build -t $BACKEND_IMAGE:${{ github.sha }} -t $BACKEND_IMAGE:latest .
+          echo "✅ Backend image built"

      - name: Build Frontend Docker Image
        run: |
-          cd ${{ env.REPO_PATH }}/frontend
-          
-          # Create .env.local with correct URLs
-          cat > .env.local << EOF
-          NEXT_PUBLIC_API_URL=https://api.pounce.ch
-          BACKEND_URL=http://pounce-backend:8000
-          EOF
-          
+          cd frontend
          docker build \
            --build-arg NEXT_PUBLIC_API_URL=https://api.pounce.ch \
            --build-arg BACKEND_URL=http://pounce-backend:8000 \
-            -t ${{ env.FRONTEND_IMAGE }}:${{ github.sha }} \
-            -t ${{ env.FRONTEND_IMAGE }}:latest \
+            -t $FRONTEND_IMAGE:${{ github.sha }} \
+            -t $FRONTEND_IMAGE:latest \
            .
-          echo "✅ Frontend image built successfully"
+          echo "✅ Frontend image built"

      - name: Deploy Backend
        env:
@ -64,42 +52,36 @@ jobs:
          docker stop pounce-backend 2>/dev/null || true
          docker rm pounce-backend 2>/dev/null || true
          
-          # Ensure persistent directories exist
+          # Ensure directories exist
          sudo mkdir -p /data/pounce/zones/czds /data/pounce/zones/switch /data/pounce/logs
-          sudo chmod -R 755 /data/pounce
+          sudo chmod -R 777 /data/pounce/zones
          
-          # Run new container with secrets from environment
+          # Deploy backend
          docker run -d \
            --name pounce-backend \
-            --network n0488s44osgoow4wgo04ogg0 \
+            --network $SUPABASE_NETWORK \
            --restart unless-stopped \
            --shm-size=8g \
-            -v /data/pounce/zones/czds:/data/czds \
-            -v /data/pounce/zones/switch:/data/switch \
-            -v /data/pounce/logs:/data/logs \
-            -e CZDS_DATA_DIR="/data/czds" \
-            -e CZDS_USERNAME="${CZDS_USERNAME}" \
-            -e CZDS_PASSWORD="${CZDS_PASSWORD}" \
-            -e SWITCH_DATA_DIR="/data/switch" \
-            -e ZONE_RETENTION_DAYS="3" \
+            -v /data/pounce/zones:/data \
            -e DATABASE_URL="${DATABASE_URL}" \
            -e SECRET_KEY="${SECRET_KEY}" \
            -e JWT_SECRET="${SECRET_KEY}" \
            -e REDIS_URL="redis://pounce-redis:6379/0" \
-            -e ENABLE_JOB_QUEUE="true" \
+            -e ENABLE_SCHEDULER="true" \
+            -e ENVIRONMENT="production" \
            -e CORS_ORIGINS="https://pounce.ch,https://www.pounce.ch" \
            -e COOKIE_SECURE="true" \
            -e SITE_URL="https://pounce.ch" \
            -e FRONTEND_URL="https://pounce.ch" \
-            -e ENVIRONMENT="production" \
-            -e ENABLE_SCHEDULER="true" \
+            -e CZDS_DATA_DIR="/data/czds" \
+            -e CZDS_USERNAME="${CZDS_USERNAME}" \
+            -e CZDS_PASSWORD="${CZDS_PASSWORD}" \
            -e SMTP_HOST="smtp.zoho.eu" \
            -e SMTP_PORT="465" \
            -e SMTP_USER="hello@pounce.ch" \
            -e SMTP_PASSWORD="${SMTP_PASSWORD}" \
            -e SMTP_FROM_EMAIL="hello@pounce.ch" \
            -e SMTP_FROM_NAME="pounce" \
-            -e SMTP_USE_TLS="false" \
            -e SMTP_USE_SSL="true" \
            -e STRIPE_SECRET_KEY="${STRIPE_SECRET_KEY}" \
            -e STRIPE_PUBLISHABLE_KEY="pk_live_51ScLbjCtFUamNRpNeFugrlTIYhszbo8GovSGiMnPwHpZX9p3SGtgG8iRHYRIlAtg9M9sl3mvT5r8pwXP3mOsPALG00Wk3j0wH4" \
@ -118,26 +100,21 @@ jobs:
            -l "traefik.http.routers.pounce-api.tls=true" \
            -l "traefik.http.routers.pounce-api.tls.certresolver=letsencrypt" \
            -l "traefik.http.services.pounce-api.loadbalancer.server.port=8000" \
-            -l "traefik.http.routers.pounce-api-http.rule=Host(\`api.pounce.ch\`)" \
-            -l "traefik.http.routers.pounce-api-http.entryPoints=http" \
-            -l "traefik.http.routers.pounce-api-http.middlewares=redirect-to-https" \
-            ${{ env.BACKEND_IMAGE }}:latest
+            $BACKEND_IMAGE:latest
          
-          # Connect to coolify network for Traefik
-          docker network connect coolify pounce-backend 2>/dev/null || true
+          # Connect to Coolify network for Traefik
+          docker network connect $COOLIFY_NETWORK pounce-backend 2>/dev/null || true
          
          echo "✅ Backend deployed"

      - name: Deploy Frontend
        run: |
-          # Stop existing container
          docker stop pounce-frontend 2>/dev/null || true
          docker rm pounce-frontend 2>/dev/null || true
          
-          # Run new container
          docker run -d \
            --name pounce-frontend \
-            --network coolify \
+            --network $COOLIFY_NETWORK \
            --restart unless-stopped \
            -l "traefik.enable=true" \
            -l "traefik.http.routers.pounce-web.rule=Host(\`pounce.ch\`) || Host(\`www.pounce.ch\`)" \
@ -145,51 +122,35 @@ jobs:
            -l "traefik.http.routers.pounce-web.tls=true" \
            -l "traefik.http.routers.pounce-web.tls.certresolver=letsencrypt" \
            -l "traefik.http.services.pounce-web.loadbalancer.server.port=3000" \
-            -l "traefik.http.routers.pounce-web-http.rule=Host(\`pounce.ch\`) || Host(\`www.pounce.ch\`)" \
-            -l "traefik.http.routers.pounce-web-http.entryPoints=http" \
-            -l "traefik.http.routers.pounce-web-http.middlewares=redirect-to-https" \
-            ${{ env.FRONTEND_IMAGE }}:latest
+            $FRONTEND_IMAGE:latest
          
-          # Connect to supabase network for backend access
-          docker network connect n0488s44osgoow4wgo04ogg0 pounce-frontend 2>/dev/null || true
+          docker network connect $SUPABASE_NETWORK pounce-frontend 2>/dev/null || true
          
          echo "✅ Frontend deployed"

-      - name: Fix Volume Permissions
-        run: |
-          echo "Setting zone file permissions..."
-          chmod -R 777 /data/pounce/zones/ 2>/dev/null || true
-          chown -R 1000:1000 /data/pounce/zones/ 2>/dev/null || true
-          echo "✅ Permissions set"
-
      - name: Health Check
        run: |
-          echo "Waiting for services to start..."
-          sleep 15
+          echo "Waiting for services..."
+          sleep 20
          
-          echo "=== Backend Health Check ==="
-          curl -sf http://localhost:8000/health || curl -sf http://pounce-backend:8000/health || echo "Backend starting..."
+          echo "=== Container Status ==="
+          docker ps --filter "name=pounce" --format "table {{.Names}}\t{{.Status}}"
          
          echo ""
-          echo "=== Container Status ==="
-          docker ps --filter "name=pounce" --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"
+          echo "=== Backend Health ==="
+          docker exec pounce-backend curl -sf http://localhost:8000/health || echo "Starting..."

      - name: Cleanup
        run: |
          docker image prune -f
          docker container prune -f
-          echo "✅ Cleanup complete"

-      - name: Deployment Summary
+      - name: Summary
        run: |
          echo "=========================================="
          echo "🎉 DEPLOYMENT SUCCESSFUL!"
          echo "=========================================="
          echo "Commit: ${{ github.sha }}"
-          echo "Branch: ${{ github.ref_name }}"
-          echo "Time: $(date)"
-          echo ""
-          echo "Services:"
-          echo "  - Frontend: https://pounce.ch"
-          echo "  - Backend:  https://api.pounce.ch"
+          echo "Frontend: https://pounce.ch"
+          echo "Backend:  https://api.pounce.ch"
          echo "=========================================="