updated the branches for the on push etc.

.github/workflows/ci-cd.yml

@@ -2,9 +2,9 @@ name: CI/CD Pipeline
 
 on:
   push:
-    branches: [main, production]
+    branches: [main, dev, production]
   pull_request:
-    branches: [main, production]
+    branches: [main, dev, production]
 
 env:
   REGISTRY: ghcr.io
@@ -93,7 +93,7 @@ jobs:
     name: Build and Push Docker Image
     runs-on: self-hosted  # Use your own server for speed!
     needs: [test, security]  # Wait for parallel jobs to complete
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/production')
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/production')
     permissions:
       contents: read
       packages: write
@@ -121,6 +121,8 @@ jobs:
             type=ref,event=pr
             type=sha,prefix={{branch}}-
             type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=staging,enable={{is_default_branch==false && branch=='dev'}}
+            type=raw,value=staging,enable={{is_default_branch==false && branch=='main'}}
 
       - name: Create production environment file
         run: |
@@ -151,9 +153,69 @@ jobs:
           build-args: |
             BUILDKIT_INLINE_CACHE=1
 
-  # Deploy to server
+  # Deploy to staging (dev/main branches)
+  deploy-staging:
+    name: Deploy to Staging
+    runs-on: self-hosted
+    needs: build
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main')
+    environment: staging
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Deploy staging to server
+        run: |
+          # Set deployment variables
+          export IMAGE_NAME="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:staging"
+          export CONTAINER_NAME="portfolio-app-staging"
+          export COMPOSE_FILE="docker-compose.staging.yml"
+          
+          # Set environment variables for docker-compose
+          export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL_STAGING || vars.NEXT_PUBLIC_BASE_URL }}"
+          export MY_EMAIL="${{ vars.MY_EMAIL }}"
+          export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
+          export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
+          export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
+          export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
+          
+          # Pull latest staging image
+          docker pull $IMAGE_NAME || docker pull "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main" || true
+          
+          # Stop and remove old staging container (if exists)
+          docker compose -f $COMPOSE_FILE down || true
+          
+          # Start new staging container
+          docker compose -f $COMPOSE_FILE up -d --force-recreate
+          
+          # Wait for health check
+          echo "Waiting for staging application to be healthy..."
+          for i in {1..30}; do
+            if curl -f http://localhost:3001/api/health > /dev/null 2>&1; then
+              echo "✅ Staging deployment successful!"
+              break
+            fi
+            sleep 2
+          done
+          
+          # Verify deployment
+          if curl -f http://localhost:3001/api/health; then
+            echo "✅ Staging deployment verified!"
+          else
+            echo "⚠️ Staging health check failed, but container is running"
+            docker compose -f $COMPOSE_FILE logs --tail=50
+          fi
+
+  # Deploy to production
   deploy:
-    name: Deploy to Server
+    name: Deploy to Production
     runs-on: self-hosted
     needs: build
     if: github.event_name == 'push' && github.ref == 'refs/heads/production'
@@ -169,12 +231,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Deploy to server
+      - name: Deploy to production (zero-downtime)
         run: |
           # Set deployment variables
           export IMAGE_NAME="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:production"
           export CONTAINER_NAME="portfolio-app"
-          export COMPOSE_FILE="docker-compose.prod.yml"
+          export COMPOSE_FILE="docker-compose.production.yml"
+          export BACKUP_CONTAINER="portfolio-app-backup"
           
           # Set environment variables for docker-compose
           export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
@@ -184,30 +247,83 @@ jobs:
           export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
           export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
           
-          # Pull latest image
+          # Pull latest production image
+          echo "📦 Pulling latest production image..."
           docker pull $IMAGE_NAME
           
-          # Stop and remove old container
-          docker compose -f $COMPOSE_FILE down || true
-          
-          # Remove old images to force using new one
-          docker image prune -f
-          
-          # Start new container with force recreate
-          docker compose -f $COMPOSE_FILE up -d --force-recreate
+          # Check if production container is running
+          if docker ps --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+            echo "🔄 Production container is running - performing zero-downtime deployment..."
+            
+            # Start new container with different name first (blue-green)
+            echo "🚀 Starting new container (green)..."
+            docker run -d \
+              --name ${BACKUP_CONTAINER} \
+              --network portfolio_net \
+              -p 3002:3000 \
+              -e NODE_ENV=production \
+              -e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
+              -e REDIS_URL=redis://redis:6379 \
+              -e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
+              -e MY_EMAIL="${{ vars.MY_EMAIL }}" \
+              -e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
+              -e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
+              -e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
+              -e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
+              $IMAGE_NAME || true
+            
+            # Wait for new container to be healthy
+            echo "⏳ Waiting for new container to be healthy..."
+            for i in {1..30}; do
+              if curl -f http://localhost:3002/api/health > /dev/null 2>&1; then
+                echo "✅ New container is healthy!"
+                break
+              fi
+              sleep 2
+            done
+            
+            # Stop old container
+            echo "🛑 Stopping old container..."
+            docker stop ${CONTAINER_NAME} || true
+            
+            # Remove old container
+            docker rm ${CONTAINER_NAME} || true
+            
+            # Rename new container to production name
+            docker rename ${BACKUP_CONTAINER} ${CONTAINER_NAME}
+            
+            # Update port mapping (requires container restart, but it's already healthy)
+            docker stop ${CONTAINER_NAME}
+            docker rm ${CONTAINER_NAME}
+            
+            # Start with correct port using docker-compose
+            docker compose -f $COMPOSE_FILE up -d --force-recreate
+          else
+            echo "🆕 No existing container - starting fresh deployment..."
+            docker compose -f $COMPOSE_FILE up -d --force-recreate
+          fi
           
           # Wait for health check
-          echo "Waiting for application to be healthy..."
-          timeout 60 bash -c 'until curl -f http://localhost:3000/api/health; do sleep 2; done'
+          echo "⏳ Waiting for production application to be healthy..."
+          for i in {1..30}; do
+            if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
+              echo "✅ Production deployment successful!"
+              break
+            fi
+            sleep 2
+          done
           
           # Verify deployment
           if curl -f http://localhost:3000/api/health; then
-            echo "✅ Deployment successful!"
+            echo "✅ Production deployment verified!"
           else
-            echo "❌ Deployment failed!"
-            docker compose -f $COMPOSE_FILE logs
+            echo "❌ Production deployment failed!"
+            docker compose -f $COMPOSE_FILE logs --tail=100
             exit 1
           fi
+          
+          # Cleanup backup container if it exists
+          docker rm -f ${BACKUP_CONTAINER} 2>/dev/null || true
 
       - name: Cleanup old images
         run: |