Simpler workflow w/ comments & clean icon names.

Author: digitalnomad91

.github/workflows/deploy-docker.yml

@@ -1,81 +1,56 @@
-name: Deploy Next.js Docker App
+name: '🚀 Deploy Next.js Docker App (Single Job)'
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
 
 jobs:
   build-and-deploy:
     runs-on: self-hosted
-
+    name: '🐳 Build & Deploy'
     steps:
-      - name: Check out repository
+      - name: '🔍 Checkout Code'
         uses: actions/checkout@v3
 
-      # Debug: Verify secret exists
-      - name: Check secret presence
+      # ========================
+      # 🔐 Secrets & Config Setup
+      # ========================
+      - name: '🔒 Verify Secrets Exist'
         run: |
           if [ -z "${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}" ]; then
-            echo "❌ Critical error: GOOGLE_SERVICES_JSON_BASE64 secret is empty!"
+            echo "❌ Critical error: GOOGLE_SERVICES_JSON_BASE64 secret missing!"
             exit 1
-          else
-            echo "✅ Secret exists (length: ${#GOOGLE_SERVICES_JSON_BASE64} chars)"
           fi
-        env:
-          GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
+          echo "✅ All secrets present"
 
-      # Decode with error handling
-      - name: Create google-services.json
+      - name: '📁 Create google-services.json'
         run: |
-          set -e  # Exit immediately on error
-          echo "Decoding base64 secret..."
           echo "$GOOGLE_SERVICES_JSON_BASE64" | base64 --decode > google-services.json
-
-          echo "Verifying file:"
-          ls -lh google-services.json
-          file google-services.json
-          head -n 2 google-services.json
-
-          if [ ! -s google-services.json ]; then
-            echo "❌ File is empty!"
-            exit 1
-          fi
+          echo "🔄 Validating JSON..."
+          jq empty google-services.json  # Requires jq installed
         env:
           GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
 
-      - name: Create .env file
+      - name: '⚙️ Create .env File'
         run: |
           echo "${{ secrets.ENV_FILE_CONTENT }}" > .env
-          echo "" >> .env  # Ensure file ends with a newline
+          echo "" >> .env  # Ensure trailing newline
 
-      - name: Debug .env file
-        run: |
-          echo "=== .env file content ==="
-          cat .env
-          echo "=== End of .env file ==="
-
-      # Debug: Check file size of google-services.json
-      - name: Check google-services.json file size
-        run: wc -c google-services.json
-
-      # Validate JSON syntax
-      - name: Validate google-services.json
-        run: node -e "JSON.parse(require('fs').readFileSync('google-services.json','utf8'))"
-
-      - name: Build Docker image
+      # ========================
+      # 🐳 Docker Operations
+      # ========================
+      - name: '🛠 Build Docker Image'
         run: docker build -t codebuilder-webapp:latest .
 
-      - name: Stop and remove old container (if running)
+      - name: '🗑 Cleanup Old Containers'
         run: |
-          OLD_CONTAINER_ID=$(docker ps -aq --filter name=codebuilder-webapp)
-          if [ -n "$OLD_CONTAINER_ID" ]; then
-            echo "Stopping and removing container $OLD_CONTAINER_ID..."
-            docker stop $OLD_CONTAINER_ID
-            docker rm $OLD_CONTAINER_ID
-          else
-            echo "No old container found."
-          fi
+          docker ps -aq --filter name=codebuilder-webapp | xargs -r docker rm -f
 
-      - name: Start new container
-        run: docker run -d --network host -p 3000:3000 --env-file .env --name codebuilder-webapp codebuilder-webapp:latest
+      - name: '🚀 Launch New Container'
+        run: |
+          docker run -d \
+            --network host \
+            -p 3000:3000 \
+            --env-file .env \
+            --name codebuilder-webapp \
+            codebuilder-webapp:latest