From 06ce338f477d8d799eac241fdc1fc40897aca0f3 Mon Sep 17 00:00:00 2001 From: janskiba Date: Thu, 8 Feb 2024 13:38:37 +0000 Subject: [PATCH] refactor: Use beam proxy directly as proxy --- bridgehead | 2 +- lib/functions.sh | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/bridgehead b/bridgehead index 49ad3a5..b1ce678 100755 --- a/bridgehead +++ b/bridgehead @@ -90,7 +90,7 @@ case "$ACTION" in loadVars hc_send log "Bridgehead $PROJECT startup: Checking requirements ..." checkRequirements - sync_secrets + sync_secrets hc_send log "Bridgehead $PROJECT startup: Requirements checked out. Now starting bridgehead ..." exec $COMPOSE -p $PROJECT -f ./minimal/docker-compose.yml -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit ;; diff --git a/lib/functions.sh b/lib/functions.sh index 7ec79ce..c175fcf 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -279,27 +279,20 @@ function sync_secrets() { fi mkdir -p /var/cache/bridgehead/secrets/ touch /var/cache/bridgehead/secrets/oidc - local override="" - if [ -f "minimal/docker-compose.override.yml" ]; then - override+=" -f ./minimal/docker-compose.override.yml" - fi - $COMPOSE -p secret_sync -f ./minimal/docker-compose.yml $override up -d forward_proxy - # The oidc provider will need to be switched based on the project at some point I guess docker run --rm \ - --network secret_sync_default \ -v /var/cache/bridgehead/secrets/oidc:/usr/local/cache \ -v $PRIVATEKEYFILENAME:/run/secrets/privkey.pem:ro \ -v /srv/docker/bridgehead/$PROJECT/root.crt.pem:/run/secrets/root.crt.pem:ro \ -v /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro \ -e TLS_CA_CERTIFICATES_DIR=/conf/trusted-ca-certs \ -e NO_PROXY=localhost,127.0.0.1 \ - -e ALL_PROXY=http://forward_proxy:3128 \ + -e ALL_PROXY=$HTTPS_PROXY_FULL_URL \ -e PROXY_ID=$PROXY_ID \ -e BROKER_URL=$BROKER_URL \ -e OIDC_PROVIDER=secret-sync-central.oidc-client-enrollment.$BROKER_ID \ -e SECRET_DEFINITIONS=$secret_sync_args \ docker.verbis.dkfz.de/cache/samply/secret-sync-local:latest - $COMPOSE -p secret_sync -f ./minimal/docker-compose.yml down forward_proxy + set -a # Export variables as environment variables source /var/cache/bridgehead/secrets/* set +a # Export variables in the regular way