Fix git action failure (#1308)

* stop gunicon * remove port mapping * remove port mapping * format envs * debugging docker system * remove warnings * check db health * restore to test * restore to test * correct number of layers in inventory --------- Co-authored-by: Emma Ai <[email protected]>
GeoscienceAustralia · Jan 21, 2025 · efc163f · efc163f
1 parent 0d00884
commit efc163f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -3,7 +3,7 @@ name: Docker Image CI
 on:
   push:
     branches: [ master ]
-    path:
+    paths:
       - 'dev/services/wms/**'
       - 'prod/services/wms/**'
   release:

diff --git a/docker-compose.ows.yaml b/docker-compose.ows.yaml
@@ -1,25 +1,22 @@
-
-version: '3.4'
-
 # Default compose will create an ows image, with dev settings and connect to a local db
 services:
   ows:
     image: opendatacube/ows:latest
     environment:
       # # Defaults are defined in .env file
-      DB_HOSTNAME: postgres
-      DB_USERNAME: opendatacube
-      DB_PASSWORD: opendatacubepassword
-      DB_DATABASE: opendatacube
-      DB_PORT: 5432
-      WMS_CONFIG_PATH: /dea-config/${OWS_CFG_PATH}
+      - ODC_DEFAULT_DB_HOSTNAME=postgres
+      - ODC_DEFAULT_DB_USERNAME=opendatacube
+      - ODC_DEFAULT_DB_PASSWORD=opendatacubepassword
+      - ODC_DEFAULT_DB_DATABASE=opendatacube
+      - WMS_CONFIG_PATH=/dea-config/${OWS_CFG_PATH}
       # # Path from the PYTHONPATH to the config object (default PYTHONPATH is /env)
-      DATACUBE_OWS_CFG: ${DATACUBE_OWS_CFG}
-      AWS_DEFAULT_REGION: ap-southeast-2
-      PYTHONPATH: /dea-config/${PYTHON_PATH}
-      INVENTORY: /dea-config/${PYTHON_PATH}/inventory.json
+      - DATACUBE_OWS_CFG=${DATACUBE_OWS_CFG}
+      - AWS_DEFAULT_REGION=ap-southeast-2
+      - PYTHONPATH=/dea-config/${PYTHON_PATH}
+      - INVENTORY=/dea-config/${PYTHON_PATH}/inventory.json
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     volumes:
       - ./:/dea-config/
       - ./artifacts:/mnt/artifacts
@@ -30,6 +27,9 @@ services:
       - POSTGRES_DB=opendatacube
       - POSTGRES_PASSWORD=opendatacubepassword
       - POSTGRES_USER=opendatacube
-    ports:
-      - "5435:5432"
     restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
diff --git a/prod/services/wms/inventory.json b/prod/services/wms/inventory.json
@@ -1,5 +1,5 @@
 {
-    "total_layers_count": 68,
+    "total_layers_count": 65,
     "layers": [
          {
             "layer": "s2_ls_combined",