Fix docker-compose to use base containers

Update database and Hasura images to current ones.
Add dependency to Tiamat as Hasura needs it to start.

Author: culka

development.sh

@@ -79,21 +79,21 @@ ensure_hasura_submodule_initialized() {
   echo "jore4-hasura submodule up to date."
 }
 
-# jore4-db - Jore 4 database. This is the database used when starting the application.
-# jore4-db-test - Jore 4 database instance for the integration tests.
+# jore4-testdb - Jore 4 database. This is the database used when starting the application.
+# jore4-testdb-test - Jore 4 database instance for the integration tests.
 # jore4-hasura - Hasura. We have to start Hasura because it ensures that db migrations are run to the Jore 4 database.
 # jore4-hasura-test - Hasura instance used in the integration tests to run db migrations to the Jore 4 database.
 
 function start_all {
   download_docker_bundle
-  $DOCKER_COMPOSE_CMD up -d jore4-db jore4-hasura jore4-db-test jore4-hasura-test
+  $DOCKER_COMPOSE_CMD up -d jore4-testdb jore4-hasura jore4-testdb-test jore4-hasura-test jore4-tiamat jore4-tiamat-test
   $DOCKER_COMPOSE_CMD up --build -d jore4-hastus
   prepare_timetables_data_inserter
 }
 
 function start_deps {
   download_docker_bundle
-  $DOCKER_COMPOSE_CMD up -d jore4-db jore4-hasura jore4-db-test jore4-hasura-test
+  $DOCKER_COMPOSE_CMD up -d jore4-testdb jore4-hasura jore4-testdb-test jore4-hasura-test jore4-tiamat jore4-tiamat-test
   prepare_timetables_data_inserter
 }
 

docker/.env

@@ -1,7 +1,9 @@
 # you may replace the bundled docker image by setting $TESTDB_DOCKER_IMAGE
-TESTDB_DOCKER_IMAGE=hsldevcom/jore4-postgres:azuredbmock-main--20230921-953dd291af112be5c6a2b77cf1d62347f9799b42
+TESTDB_DOCKER_IMAGE=hsldevcom/jore4-postgres:azuredbmock-main--20240320-51b69beb35e165aa543ec8d360623f10a30e69f0
 
 # locking hasura image so that we can develop against a static graphql API
 # Link to available jore4-hasura images in Docker Hub:
 # https://hub.docker.com/r/hsldevcom/jore4-hasura/tags?page=1&ordering=last_updated
-HASURA_DOCKER_IMAGE=hsldevcom/jore4-hasura:hsl-main--20231222-48ba65d784d28460b8738f3e41161a0b13dc1741
+HASURA_DOCKER_IMAGE=hsldevcom/jore4-hasura:hsl-main--20240422-e9d5cd9c45df915c55dbb84b5b65bc8f4f342522
+
+TIAMAT_DOCKER_IMAGE=hsldevcom/jore4-tiamat:main--20240527-28ce6b187b6567531b1be163c9d6ae044754f900

docker/docker-compose.custom.yml

@@ -8,50 +8,42 @@ services:
     build:
       context: ".."
 
-  jore4-db:
-    container_name: "database"
-    extends:
-      service: jore4-testdb
-      file: docker-compose.yml
-    image: "${TESTDB_DOCKER_IMAGE}"
-    ports:
-      - "127.0.0.1:6432:5432"
-
-  jore4-db-test:
+  jore4-testdb-test:
     container_name: "database-test"
     extends:
-      service: jore4-testdb
-      file: docker-compose.yml
+      service: jore4-testdb-base
+      file: docker-compose.base.yml
     image: "${TESTDB_DOCKER_IMAGE}"
     ports:
       - "127.0.0.1:6433:5432"
 
-  jore4-hasura:
-    container_name: "hasura"
-    image: "${HASURA_DOCKER_IMAGE}"
+  jore4-tiamat-test:
+    container_name: "tiamat-test"
     extends:
-      service: jore4-hasura
-      file: docker-compose.yml
-    ports:
-      - "127.0.0.1:3201:8080"
-    # Waiting for database to be ready to avoid startup delay due to hasura crashing at startup if db is offline
-    # Note: this should only be done in development setups as Kubernetes does not allow waiting for services to be ready
+      service: jore4-tiamat-base
+      file: docker-compose.base.yml
+    image: "${TIAMAT_DOCKER_IMAGE}"
+    environment:
+      - TIAMAT_DB_URL=jdbc:postgresql://jore4-testdb-test:5432/stopdb?stringtype=unspecified
     depends_on:
-      jore4-db:
+      jore4-testdb-test:
         condition: service_healthy
-    environment:
-      DB_HOSTNAME: "jore4-db"
 
   jore4-hasura-test:
     container_name: "hasura-test"
     image: "${HASURA_DOCKER_IMAGE}"
     extends:
-      service: jore4-hasura
-      file: docker-compose.yml
+      service: jore4-hasura-base
+      file: docker-compose.base.yml
     ports:
       - "127.0.0.1:3202:8080"
     depends_on:
-      jore4-db-test:
+      jore4-testdb-test:
+        condition: service_healthy
+      jore4-tiamat-test:
         condition: service_healthy
     environment:
-      DB_HOSTNAME: "jore4-db-test"
+      - DB_HOSTNAME=jore4-testdb-test
+      - SKIP_SET_VARIABLE_SECRET_OVERRIDE=true
+      - TIAMAT_HOSTNAME=jore4-tiamat-test
+      - TIMETABLESAPI_HOSTNAME=jore4-timetablesapi