feat(ci): compose/oc cleanup and consistency (#1306)

Co-authored-by: Ricardo Campos <[email protected]>
bcgov · Jul 1, 2024 · 5d82090 · 5d82090
1 parent de9fcb4
commit 5d82090
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -7,4 +7,4 @@ RUN sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pg
 # User, port and Healthcheck
 USER postgres
 EXPOSE 5432
-HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "pg_isready", "-U", ${POSTGRES_USER} ]
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["psql", "-q", "-U", "$${POSTGRES_USER}", "-d", "$${POSTGRES_DB}", "-c", "SELECT 1"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 ---
 
 x-postgres-vars: &postgres-vars
-  POSTGRES_DATABASE: spar
+  POSTGRES_DB: spar
   POSTGRES_HOST: database
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: default
@@ -20,26 +20,19 @@ x-frontend: &frontend
     VITE_ZONE: TEST
   healthcheck:
     test: timeout 10s bash -c 'true > /dev/tcp/127.0.0.1/3000'
-    interval: 10s
-    timeout: 10s
-    retries: 5
-    start_period: 10s
 
 services:
   database:
     container_name: database
+    build: ./database
     environment:
       <<: *postgres-vars
     volumes:
       - "/pgdata"
       - "./database/init_db:/init_db"
     ports: ["5432:5432"]
     healthcheck:
-      test: pg_isready -U postgres
-      interval: 5s
-      timeout: 5s
-      retries: 5
-    image: postgis/postgis:15-master
+      test: psql -q -U $${POSTGRES_USER} -d $${POSTGRES_DB} -c 'SELECT 1'
 
   backend:
     container_name: backend
@@ -63,9 +56,6 @@ services:
       - $HOME/zscaler-certs:/certs
     healthcheck:
       test: curl -f http://localhost:8090/actuator/health | grep '"status":"UP"'
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
   frontend:
     container_name: frontend
@@ -122,9 +112,6 @@ services:
     volumes: ["./oracle-api:/app"]
     healthcheck:
       test: curl -f http://localhost:8091/actuator/health | grep '"status":"UP"'
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
   schemaspy:
     container_name: schemaspy

diff --git a/sync/openshift.deploy.yml b/sync/openshift.deploy.yml
@@ -109,7 +109,7 @@ objects:
                           key: oracle-user
                     - name: POSTGRES_HOST
                       value: ${REPO}-${ZONE}-database
-                    - name: POSTGRES_DATABASE
+                    - name: POSTGRES_DB
                       valueFrom:
                         secretKeyRef:
                           name: ${REPO}-${ZONE}-database

diff --git a/sync/src/main.py b/sync/src/main.py
@@ -36,7 +36,7 @@ def generate_db_config(type_,schema_,settings):
             "username": os.environ.get("POSTGRES_USER"),
             "password": os.environ.get("POSTGRES_PASSWORD"),
             "host": os.environ.get("POSTGRES_HOST"),
-            "database": os.environ.get("POSTGRES_DATABASE"),
+            "database": os.environ.get("POSTGRES_DB"),
             "port": os.environ.get("POSTGRES_PORT"),
             "schema": schema_,
             "test_query": "SELECT 'SUCCESS' a",
@@ -60,7 +60,7 @@ def required_variables_exists():
        not env_var_is_filled("POSTGRES_PORT") or  \
        not env_var_is_filled("POSTGRES_USER") or \
        not env_var_is_filled("POSTGRES_PASSWORD") or \
-       not env_var_is_filled("POSTGRES_DATABASE") or \
+       not env_var_is_filled("POSTGRES_DB") or \
        not env_var_is_filled("ORACLE_PORT") or \
        not env_var_is_filled("ORACLE_HOST") or \
        not env_var_is_filled("ORACLE_SERVICE") or \