Merge branch 'staging'

.github/workflows/build_and_deploy.yml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   pytest:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       image_name: ghcr.io/${{ github.repository }}/backend
       build_context: src/backend
@@ -29,20 +29,20 @@ jobs:
     secrets: inherit
 
   frontend-tests:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       working_dir: src/frontend
 
   backend-build:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     needs: [pytest]
     with:
       context: src/backend
       build_target: prod
       image_name: ghcr.io/${{ github.repository }}/backend
 
   frontend-build:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     needs: [frontend-tests]
     with:
       context: src/frontend
@@ -152,7 +152,7 @@ jobs:
     needs:
       - smoke-test-backend
       - smoke-test-frontend
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       environment: ${{ github.ref_name }}
       docker_compose_file: "docker-compose.${{ github.ref_name }}.yml"

.github/workflows/build_ci_img.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   backend-ci-build:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: src/backend
       build_target: ci

.github/workflows/build_odk_imgs.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   build-odkcentral:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: odkcentral/api
       image_tags: |
@@ -26,7 +26,7 @@ jobs:
       # multi_arch: true
 
   build-odkcentral-ui:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: odkcentral/ui
       image_tags: |

.github/workflows/build_proxy_imgs.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build-cert-init-main:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: nginx
       build_target: certs-init-main
@@ -21,7 +21,7 @@ jobs:
       multi_arch: true
 
   build-cert-init-dev:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: nginx
       build_target: certs-init-development
@@ -33,7 +33,7 @@ jobs:
       multi_arch: true
 
   build-proxy-main:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: nginx
       build_target: main
@@ -44,7 +44,7 @@ jobs:
       multi_arch: true
 
   build-proxy-dev:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: nginx
       build_target: development

.github/workflows/docs.yml

@@ -12,19 +12,19 @@ on:
 
 jobs:
   build_doxygen:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       output_path: docs/apidocs
 
   build_openapi_json:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       image: ghcr.io/${{ github.repository }}/backend:ci-${{ github.ref_name }}
       example_env_file_path: ".env.example"
       output_path: docs/openapi.json
 
   publish_docs:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     needs:
       - build_doxygen
       - build_openapi_json

.github/workflows/pr_test_backend.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   pytest:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       image_name: ghcr.io/${{ github.repository }}/backend
       build_context: src/backend

.github/workflows/pr_test_frontend.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   unit-tests:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       working_dir: src/frontend
 

.github/workflows/tag_build.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   backend-build:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       context: src/backend
       build_target: prod

.github/workflows/wiki.yml

@@ -10,6 +10,6 @@ on:
 
 jobs:
   publish-docs-to-wiki:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].2
     with:
       homepage_path: "wiki_redirect.md"

src/backend/Dockerfile

@@ -64,7 +64,7 @@ RUN pdm export --prod > requirements.txt \
 FROM base as build
 # NOTE this argument is specified during production build on Github workflow
 # NOTE only the production API image contains the monitoring dependencies
-ARG WITH_MONITORING
+ARG MONITORING
 RUN set -ex \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install \
@@ -84,7 +84,7 @@ COPY --from=extract-deps \
     /opt/python/
 # Install with or without monitoring, depending on flag
 RUN pip install --user --no-warn-script-location --no-cache-dir \
-    $(if [ "$WITH_MONITORING" = "true" ]; then \
+    $(if [ "$MONITORING" = "true" ]; then \
         echo "-r /opt/python/requirements-monitoring.txt"; \
     else \
         echo "-r /opt/python/requirements.txt"; \