From 634d4e2a4b76accb609ba594c9c38112569b8d8b Mon Sep 17 00:00:00 2001 From: Bridgehead User Date: Fri, 18 Oct 2024 13:32:06 +0200 Subject: [PATCH] Added comments explaining how things have been changed for local testing --- ccp/docker-compose.yml | 6 ++++++ ccp/modules/teiler-compose.yml | 2 ++ lib/functions.sh | 3 +++ 3 files changed, 11 insertions(+) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index d8016f6..c714d94 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -20,6 +20,9 @@ services: - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,auth" - "traefik.http.routers.blaze_ccp.tls=true" +# Modification needed for running in a test mode +# Commented out so that the Bridgehead can run without Beam. + # focus: # image: docker.verbis.dkfz.de/cache/samply/focus:0.4.4 # container_name: bridgehead-focus @@ -35,6 +38,9 @@ services: ## - "beam-proxy" # - "blaze" +# Modification needed for running in a test mode +# Commented out so that the Bridgehead can run without Beam. + # beam-proxy: # image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop # container_name: bridgehead-beam-proxy diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml index 679101d..c6bcd9d 100644 --- a/ccp/modules/teiler-compose.yml +++ b/ccp/modules/teiler-compose.yml @@ -47,8 +47,10 @@ services: TEILER_ADMIN: "${OIDC_ADMIN_GROUP}" REPORTER_DEFAULT_TEMPLATE_ID: "ccp-qb" EXPORTER_DEFAULT_TEMPLATE_ID: "ccp" + # Modification needed for running in a test mode APPLICATION_PORT: "8080" CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf" + # Modification needed for running in a test mode secrets: - ccp.conf diff --git a/lib/functions.sh b/lib/functions.sh index 198ffe6..68cfdfb 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -308,6 +308,7 @@ function sync_secrets() { BROKER_ROOT_CERT=/srv/docker/bridgehead/bbmri/$GBN_ROOT_CERT.crt.pem PROXY_ID=$GBN_PROXY_ID BROKER_ID=$GBN_BROKER_ID + # Modification needed for running in a test mode elif [ "${PROJECT}" == "ccp" ]; then BROKER_ROOT_CERT=/srv/docker/bridgehead/ccp/root.crt.pem else @@ -316,6 +317,8 @@ function sync_secrets() { local broker_url="https://$BROKER_ID" mkdir -p /var/cache/bridgehead/secrets/ || fail_and_report 1 "Failed to create '/var/cache/bridgehead/secrets/'. Please run sudo './bridgehead install $PROJECT' again." touch /var/cache/bridgehead/secrets/oidc +# Modification needed for running in a test mode +# Commented out so that the Bridgehead can run without Beam. # docker run --rm \ # -v /var/cache/bridgehead/secrets/oidc:/usr/local/cache \ # -v $PRIVATEKEYFILENAME:/run/secrets/privkey.pem:ro \