From f0d423fcf7944525566460c49cf0ba1e27ce9392 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Wed, 28 Jun 2023 11:48:47 +0200 Subject: [PATCH] Adapt to new beam app syntax --- bbmri/modules/dnpm-compose.yml | 3 +-- ccp/modules/dnpm-compose.yml | 4 +--- minimal/modules/dnpm-compose.yml | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bbmri/modules/dnpm-compose.yml b/bbmri/modules/dnpm-compose.yml index 48d58de..0cbc45f 100644 --- a/bbmri/modules/dnpm-compose.yml +++ b/bbmri/modules/dnpm-compose.yml @@ -7,8 +7,7 @@ services: environment: BROKER_URL: ${DNPM_BROKER_URL} PROXY_ID: ${DNPM_PROXY_ID} - APP_0_ID: dnpm-connect - APP_0_KEY: ${DNPM_BEAM_SECRET_SHORT} + APP_dnpm-connect_KEY: ${DNPM_BEAM_SECRET_SHORT} PRIVKEY_FILE: /run/secrets/proxy.pem ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index a4ef1aa..9286d32 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -3,9 +3,7 @@ version: "3.7" services: beam-proxy: environment: - APP_3_ID: dnpm-connect - APP_3_KEY: ${DNPM_BEAM_SECRET_SHORT} - + APP_dnpm-connect_KEY: ${DNPM_BEAM_SECRET_SHORT} dnpm-beam-connect: depends_on: [ beam-proxy ] image: docker.verbis.dkfz.de/cache/samply/beam-connect:dnpm diff --git a/minimal/modules/dnpm-compose.yml b/minimal/modules/dnpm-compose.yml index f320ead..276f5ff 100644 --- a/minimal/modules/dnpm-compose.yml +++ b/minimal/modules/dnpm-compose.yml @@ -7,8 +7,7 @@ services: environment: BROKER_URL: ${DNPM_BROKER_URL} PROXY_ID: ${DNPM_PROXY_ID} - APP_0_ID: dnpm-connect - APP_0_KEY: ${DNPM_BEAM_SECRET_SHORT} + APP_dnpm-connect_KEY: ${DNPM_BEAM_SECRET_SHORT} PRIVKEY_FILE: /run/secrets/proxy.pem ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: ./conf/trusted-ca-certs