Replace manual wait loop with docker compose --wait and move cache config to CI override

Co-authored-by: dannystaple <426859+dannystaple@users.noreply.github.com>

Author: Copilot

.github/workflows/on_call_staging_test.yaml

@@ -25,12 +25,9 @@ jobs:
           
       - name: Run as service and test
         run: |
-          # Start the staging service using docker compose (context will be _site now)
-          docker compose up -d --build staging
-          
-          # Wait for the health check to pass (healthcheck should handle readiness)
-          echo "Waiting for service to be ready..."
-          timeout 60 bash -c 'until curl -f http://localhost:8080/ >/dev/null 2>&1; do sleep 2; done'
+          # Start the staging service using docker compose with --wait for health checks
+          # Use CI-specific override for GitHub Actions cache
+          docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build --wait staging
           
           # Perform the tests
           set +e  # Don't exit on error so we can clean up
@@ -41,7 +38,7 @@ jobs:
           curl -I -f http://localhost:8080/wiki/lego || exit_code=1
           
           # Stop the service regardless of test outcome
-          docker compose stop staging
+          docker compose -f docker-compose.yml -f docker-compose.ci.yml stop staging
           
           # Exit with the test result
           exit $exit_code

docker-compose.ci.yml

@@ -0,0 +1,7 @@
+services:
+  staging:
+    build:
+      cache_from:
+        - type=gha
+      cache_to:
+        - type=gha,mode=max

docker-compose.yml

@@ -109,10 +109,6 @@ services:
     build:
       context: ./_site
       dockerfile: ../.github/scripts/staging/Dockerfile
-      cache_from:
-        - type=gha
-      cache_to:
-        - type=gha,mode=max
     ports:
       - 8080:80
     healthcheck: