Update the local docker-compose setup

Author: Tamas Pallos

development.sh

@@ -12,22 +12,12 @@ mkdir -p ./docker
 DOCKER_COMPOSE_CMD="docker-compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.custom.yml"
 
 function check_docker {
-  # compare versions
-  GITHUB_VERSION=$(curl -L https://github.com/HSLdevcom/jore4-flux/releases/download/e2e-docker-compose/RELEASE_VERSION.txt --silent)
-  LOCAL_VERSION=$(cat ./docker/RELEASE_VERSION.txt || echo "unknown")
-
-  # download latest version of the docker-compose package in case it has changed
-  if [ "$GITHUB_VERSION" != "$LOCAL_VERSION" ]; then
-    echo "E2E docker-compose package is not up to date, downloading a new version."
-    curl -L https://github.com/HSLdevcom/jore4-flux/releases/download/e2e-docker-compose/e2e-docker-compose.tar.gz --silent | tar -xzf - -C ./docker/
-  else
-    echo "E2E docker-compose package is up to date, no need to download new version."
-  fi
+  curl https://raw.githubusercontent.com/HSLdevcom/jore4-tools/main/docker/download-docker-bundle.sh | bash
 }
 
 function start {
   check_docker
-  $DOCKER_COMPOSE_CMD up --build -d jore4-hastus
+  $DOCKER_COMPOSE_CMD up --build -d jore4-hastus jore4-hasura jore4-testdb
 }
 
 function stop_all {

docker/docker-compose.custom.yml

@@ -1,15 +1,20 @@
 ---
-version: "1.0"
+version: "3.8"
 services:
+  # build and run the local image instead
+  # note: it's currently expose on port 3008
   jore4-hastus:
     build:
       context: ".."
-    container_name: hastus
-    restart: "unless-stopped"
-    networks:
-      - jore4
-    ports:
-      - "127.0.0.1:3008:8080"
 
-networks:
-  jore4:
+  jore4-hasura:
+    # 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
+    # The :seed tag contains the latest main-build image with seed data.
+    image: 'hsldevcom/jore4-hasura:seed-main--20230315-e9a40861ebd8bb78d777ce18c7a942c5cbdbfd74'
+    # 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
+    depends_on:
+      jore4-testdb:
+        condition: service_healthy