From 764bbe9aa1722b5a13872994e00ccaf9f28d8e1f Mon Sep 17 00:00:00 2001 From: Reuben Frankel Date: Mon, 3 Jun 2024 17:23:15 +0100 Subject: [PATCH] Use YAML syntax for `depends_on` for IDE autocompletion --- docker-compose.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a8627b3..ac65001 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,13 @@ services: - REACT_APP_ENV=distribution # Define APP_OAUTH_GOOGLE_CLIENT_ID to enable Google OAuth plugin settings #- APP_OAUTH_GOOGLE_CLIENT_ID= - depends_on: {"search-setup": {"condition": "service_completed_successfully"}, "search": {"condition": "service_healthy"}, "db": {"condition": "service_healthy"}} + depends_on: + search-setup: + condition: service_completed_successfully + search: + condition: service_healthy + db: + condition: service_healthy healthcheck: test: curl -fs http://localhost:8080/actuator/health | grep '^\{"status":"UP"' > /dev/null interval: 30s @@ -74,7 +80,9 @@ services: interval: 30s timeout: 10s retries: 5 - depends_on: {"search-createcerts": {"condition": "service_completed_successfully"}} + depends_on: + search-createcerts: + condition: service_completed_successfully # Short lived container that sets up elastic search search-setup: @@ -94,7 +102,9 @@ services: volumes: - ./orchestrate/matatika/elastic-search/config:/usr/share/elasticsearch/config/ - es-certs:/usr/share/elasticsearch/config/certs - depends_on: {"search": {"condition": "service_healthy"}} + depends_on: + search: + condition: service_healthy # Short lived container that creates the certificates search-createcerts: @@ -139,7 +149,11 @@ services: - ./orchestrate/matatika/elastic-logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml - ./orchestrate/matatika/elastic-logstash/pipeline:/usr/share/logstash/pipeline - es-certs:/etc/certs - depends_on: {"search-setup": {"condition": "service_completed_successfully"}, "search": {"condition": "service_healthy"}} + depends_on: + search-setup: + condition: service_completed_successfully + search: + condition: service_healthy db: image: postgres:11