From a0333864648907037ed3b6111b8bf06d3606439c Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Wed, 28 Jun 2023 15:38:05 +0200 Subject: [PATCH 1/2] Absolute path for beam root cert --- bbmri/docker-compose.yml | 2 +- ccp/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 8ad8211..07f1a2f 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -50,7 +50,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - ./root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/bbmri/root.crt.pem:/conf/root.crt.pem:ro volumes: blaze-data: diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 7b7e129..786acc9 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -52,7 +52,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - ./root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro volumes: From f41e7df8204fe68e6f506c0b57760d94f88e4d09 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Thu, 29 Jun 2023 07:52:11 +0000 Subject: [PATCH 2/2] Fix docker namespaces step 1 of 2 --- bridgehead | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgehead b/bridgehead index 9824e3b..6481ef0 100755 --- a/bridgehead +++ b/bridgehead @@ -74,7 +74,7 @@ case "$ACTION" in checkRequirements hc_send log "Bridgehead $PROJECT startup: Requirements checked out. Now starting bridgehead ..." export LDM_LOGIN=$(getLdmPassword) - exec $COMPOSE -f ./minimal/docker-compose.yml -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit + exec $COMPOSE -p $PROJECT -f ./minimal/docker-compose.yml -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit ;; stop) loadVars