From d97b42859e9d86691421b9e7ef600b29008ea1e2 Mon Sep 17 00:00:00 2001 From: janskiba Date: Thu, 15 Feb 2024 13:13:52 +0000 Subject: [PATCH] fix: Start oauth proxy after forward_proxy is ready --- ccp/modules/datashield-compose.yml | 3 ++- minimal/docker-compose.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml index 2127ac2..db2760a 100644 --- a/ccp/modules/datashield-compose.yml +++ b/ccp/modules/datashield-compose.yml @@ -154,7 +154,8 @@ services: http_proxy: "http://forward_proxy:3128" https_proxy: "http://forward_proxy:3128" depends_on: - - forward_proxy + forward_proxy: + condition: service_healthy secrets: opal-cert.pem: diff --git a/minimal/docker-compose.yml b/minimal/docker-compose.yml index 9a43953..217f1b3 100644 --- a/minimal/docker-compose.yml +++ b/minimal/docker-compose.yml @@ -42,6 +42,8 @@ services: - /var/spool/squid volumes: - /etc/bridgehead/trusted-ca-certs:/docker/custom-certs/:ro + healthcheck: + test: ["CMD", "sleep", "1"] landing: container_name: bridgehead-landingpage