From d2c66eba74b3204830ebb560eed451befe02a78f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 23 Dec 2022 16:24:56 +0100
Subject: [PATCH] Improve start up of dependent services in docker compose
---
goofy-client/.editorconfig | 5 ++++-
goofy-client/apps/goofy-e2e/docker-compose.yml | 11 +++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/goofy-client/.editorconfig b/goofy-client/.editorconfig
index c459c0b1dd..e14b6a99e7 100644
--- a/goofy-client/.editorconfig
+++ b/goofy-client/.editorconfig
@@ -33,4 +33,7 @@ indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
-insert_final_newline = false
\ No newline at end of file
+insert_final_newline = false
+
+[*.yml]
+indent_size = 2
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/docker-compose.yml b/goofy-client/apps/goofy-e2e/docker-compose.yml
index 04437692a6..5b6b1760de 100644
--- a/goofy-client/apps/goofy-e2e/docker-compose.yml
+++ b/goofy-client/apps/goofy-e2e/docker-compose.yml
@@ -46,8 +46,10 @@ services:
ports:
- 9091:9090
depends_on:
- - ozg-mongodb
- - ozg-elastic
+ ozg-mongodb:
+ condition: service_started
+ ozg-elastic:
+ condition: service_healthy
ozg-goofy:
image: docker.ozg-sh.de/goofy:${GOOFY_DOCKER_IMAGE:-snapshot-latest}
@@ -82,6 +84,11 @@ services:
nofile:
soft: 65536
hard: 65536
+ healthcheck:
+ test: [ "CMD", "curl", "-f", "http://localhost:9200" ]
+ timeout: 10s
+ retries: 5
+ start_period: 30s
ozg-usermanager:
image: docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}
--
GitLab