Merge branch 'staging'

.github/workflows/build_and_deploy.yml

@@ -94,13 +94,13 @@ jobs:
           # Migrate db first, so api works
           docker compose up migrations --exit-code-from migrations
 
-          # Run without migrations (give exit code 0), or api
+          # Run without migrations (avoid exit code 0)
           docker compose up --detach \
             --no-deps --wait --wait-timeout 60 \
-            central-db central central-proxy s3
+            central-db central central-proxy s3 api
 
-          # Start api attached to view logs
-          docker compose up --no-deps api
+          # View logs afterwards
+          docker compose logs api
 
   smoke-test-frontend:
     runs-on: ubuntu-latest

.github/workflows/build_odk_imgs.yml

@@ -19,7 +19,7 @@ jobs:
       image_tags: |
         "ghcr.io/${{ github.repository }}/odkcentral:${{ vars.ODK_CENTRAL_TAG }}"
         "ghcr.io/${{ github.repository }}/odkcentral:latest"
-      build_args: |
+      extra_build_args: |
         ODK_CENTRAL_TAG=${{ vars.ODK_CENTRAL_TAG }}
 
   build-proxy:

odkcentral/proxy/Dockerfile

@@ -24,5 +24,5 @@ COPY . /etc/nginx
 RUN cat /etc/nginx/central.crt /etc/nginx/ca.crt \
     >> /etc/nginx/central-fullchain.crt
 # Add Healthcheck
-HEALTHCHECK --start-period=5s --interval=5s --retries=8 \
+HEALTHCHECK --start-period=5s --interval=5s --retries=20 \
     CMD nc -z localhost 443 || exit 1

src/backend/Dockerfile

@@ -123,7 +123,7 @@ VOLUME /opt/app/images
 # Change to non-root user
 USER appuser
 # Add Healthcheck
-HEALTHCHECK --start-period=10s --interval=5s --retries=8 --timeout=5s \
+HEALTHCHECK --start-period=10s --interval=5s --retries=20 --timeout=5s \
     CMD curl --fail http://localhost:8000 || exit 1