From 83555540f5f95bab7381e9881c3ae516ef200fc6 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Mon, 10 Mar 2025 12:08:19 +0100 Subject: [PATCH 1/2] chore: update central Secret Sync proxy ID (#280) --- lib/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/functions.sh b/lib/functions.sh index 9cc7d99..44b000c 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -313,7 +313,7 @@ function sync_secrets() { -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 OIDC_PROVIDER=secret-sync-central.central-secret-sync.$BROKER_ID \ -e SECRET_DEFINITIONS=$secret_sync_args \ docker.verbis.dkfz.de/cache/samply/secret-sync-local:latest @@ -351,7 +351,7 @@ function secret_sync_gitlab_token() { -e ALL_PROXY=$HTTPS_PROXY_FULL_URL \ -e PROXY_ID=$PROXY_ID \ -e BROKER_URL=$BROKER_URL \ - -e GITLAB_PROJECT_ACCESS_TOKEN_PROVIDER=secret-sync-central.oidc-client-enrollment.$BROKER_ID \ + -e GITLAB_PROJECT_ACCESS_TOKEN_PROVIDER=secret-sync-central.central-secret-sync.$BROKER_ID \ -e SECRET_DEFINITIONS=GitLabProjectAccessToken:BRIDGEHEAD_CONFIG_REPO_TOKEN:$gitlab \ docker.verbis.dkfz.de/cache/samply/secret-sync-local:latest if [ $? -eq 0 ]; then From 5d94bac0e2326b495f24695c18a385e3f03cf871 Mon Sep 17 00:00:00 2001 From: Martin Lablans <6804500+lablans@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:03:05 +0100 Subject: [PATCH 2/2] Mount queries_to_cache.conf readonly (#282) --- cce/docker-compose.yml | 2 +- ccp/docker-compose.yml | 2 +- dhki/docker-compose.yml | 2 +- itcc/docker-compose.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cce/docker-compose.yml b/cce/docker-compose.yml index 1ce28f6..c9fdabd 100644 --- a/cce/docker-compose.yml +++ b/cce/docker-compose.yml @@ -35,7 +35,7 @@ services: QUERIES_TO_CACHE: '/queries_to_cache.conf' ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze} volumes: - - /srv/docker/bridgehead/cce/queries_to_cache.conf:/queries_to_cache.conf + - /srv/docker/bridgehead/cce/queries_to_cache.conf:/queries_to_cache.conf:ro depends_on: - "beam-proxy" - "blaze" diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 871eec2..1471d15 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -35,7 +35,7 @@ services: QUERIES_TO_CACHE: '/queries_to_cache.conf' ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze} volumes: - - /srv/docker/bridgehead/ccp/queries_to_cache.conf:/queries_to_cache.conf + - /srv/docker/bridgehead/ccp/queries_to_cache.conf:/queries_to_cache.conf:ro depends_on: - "beam-proxy" - "blaze" diff --git a/dhki/docker-compose.yml b/dhki/docker-compose.yml index d37f1a2..c386078 100644 --- a/dhki/docker-compose.yml +++ b/dhki/docker-compose.yml @@ -33,7 +33,7 @@ services: EPSILON: 0.28 QUERIES_TO_CACHE: '/queries_to_cache.conf' volumes: - - /srv/docker/bridgehead/dhki/queries_to_cache.conf:/queries_to_cache.conf + - /srv/docker/bridgehead/dhki/queries_to_cache.conf:/queries_to_cache.conf:ro depends_on: - "beam-proxy" - "blaze" diff --git a/itcc/docker-compose.yml b/itcc/docker-compose.yml index 879b7b9..289c8df 100644 --- a/itcc/docker-compose.yml +++ b/itcc/docker-compose.yml @@ -35,7 +35,7 @@ services: QUERIES_TO_CACHE: '/queries_to_cache.conf' ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze} volumes: - - /srv/docker/bridgehead/itcc/queries_to_cache.conf:/queries_to_cache.conf + - /srv/docker/bridgehead/itcc/queries_to_cache.conf:/queries_to_cache.conf:ro depends_on: - "beam-proxy" - "blaze"