Changed finetuned Docker Compose files.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

bin/docker-wait-on-containers.sh

@@ -10,7 +10,5 @@ do
   docker ps -a --filter label=compas
 done
 
-docker logs compas_scl-data-service_1
-
 echo "Done no containers with filter 'health=starting'."
 docker ps -a --filter label=compas

compas/docker-compose-basex.yml

@@ -51,6 +51,12 @@ services:
       - USERINFO_WHO_CLAIMNAME=name
       - USERINFO_SESSION_WARNING=20
       - USERINFO_SESSION_EXPIRES=30
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
+        window: 30s
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/compas-scl-data-service/q/health/ready"]
       interval: 15s
@@ -70,6 +76,12 @@ services:
       - JWT_VERIFY_CLIENT_ID=cim-mapping
       - JWT_GROUPS_PATH=resource_access/cim-mapping/roles
       - USERINFO_WHO_CLAIMNAME=name
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
+        window: 30s
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/compas-cim-mapping/q/health/ready"]
       interval: 15s

compas/docker-compose-postgresql.yml

@@ -17,9 +17,9 @@ services:
       - PGDATA=/var/lib/postgresql/data/compas
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 5s
+      interval: 15s
       timeout: 10s
-      retries: 10
+      retries: 5
     volumes:
       - postgresql-data-volume:/var/lib/postgresql/data
 
@@ -83,6 +83,12 @@ services:
       - JWT_VERIFY_CLIENT_ID=cim-mapping
       - JWT_GROUPS_PATH=resource_access/cim-mapping/roles
       - USERINFO_WHO_CLAIMNAME=name
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
+        window: 30s
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/compas-cim-mapping/q/health/ready"]
       interval: 15s