More forceful removal of existing container.

Author: digitalnomad91

.github/workflows/deploy.yml

@@ -12,6 +12,7 @@ jobs:
       - name: '🔍 Checkout Code'
         uses: actions/checkout@v4
 
+      # (Secrets and .env setup steps remain the same)
       - name: '🔒 Verify Secrets Exist'
         run: |
           if [ -z "${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}" ]; then
@@ -41,46 +42,39 @@ jobs:
       # =======================================================
       - name: '🚀 Build, Launch, and Update Services'
         run: |
-          # Step 1: Explicitly check for the network and create it only if it's missing.
+          # Step 1: Ensure the Docker network exists.
           if ! docker network ls | grep -q "codebuilder-net"; then
             echo "Network 'codebuilder-net' not found. Creating it..."
             docker network create codebuilder-net
           else
             echo "Network 'codebuilder-net' already exists. Skipping creation."
           fi
 
-          # Step 2: Explicitly check and manage the database container.
+          # Step 2: Ensure the database container is running.
           DB_CONTAINER_NAME="codebuilder-postgres-db"
           if [ $(docker ps -a -q -f name=^/${DB_CONTAINER_NAME}$) ]; then
-            # The container exists, check if it is running.
-            if [ $(docker ps -q -f name=^/${DB_CONTAINER_NAME}$) ]; then
-              echo "Database container '${DB_CONTAINER_NAME}' is already running."
-            else
-              # The container exists but is stopped, so start it.
-              echo "Database container '${DB_CONTAINER_NAME}' exists but is stopped. Starting it..."
+            if ! [ $(docker ps -q -f name=^/${DB_CONTAINER_NAME}$) ]; then
+              echo "Database container exists but is stopped. Starting it..."
               docker start ${DB_CONTAINER_NAME}
             fi
           else
-            # The container does not exist, so create it for the first time.
-            echo "Database container '${DB_CONTAINER_NAME}' not found. Creating it..."
+            echo "Database container not found. Creating it..."
             docker compose up -d db
           fi
 
-          # Step 3: Wait for the database to be fully ready.
+          # Step 3: Wait for the database to be healthy.
           echo "Waiting for database to become available on localhost:5434..."
-          while ! nc -z localhost 5434; do
-            sleep 1
-          done
-          echo "✅ Database is healthy and listening."
+          while ! nc -z localhost 5434; do sleep 1; done
+          echo "✅ Database is healthy."
 
           # Step 4: Build the new webapp image.
           echo "Building the latest webapp image..."
           docker compose build webapp
 
-          # Step 5: Explicitly stop and remove the old webapp container to prevent conflicts.
-          echo "Stopping and removing old webapp container if it exists..."
-          docker compose stop webapp || true
-          docker compose rm -f webapp || true
+          # Step 5: THE DEFINITIVE FIX. Forcefully remove the old webapp container by its exact name.
+          # This is the most direct command and bypasses any ambiguity from Docker Compose's state.
+          echo "Forcefully removing old webapp container to prevent conflicts..."
+          docker rm -f codebuilder-webapp || true
 
           # Step 6: Deploy the new webapp container.
           echo "Deploying the new webapp container..."