Adapt to new beam app syntax

This commit is contained in:
Tobias Kussel 2023-06-28 11:48:47 +02:00
parent 3304d2818d
commit f0d423fcf7
3 changed files with 3 additions and 7 deletions

View File

@ -7,8 +7,7 @@ services:
environment: environment:
BROKER_URL: ${DNPM_BROKER_URL} BROKER_URL: ${DNPM_BROKER_URL}
PROXY_ID: ${DNPM_PROXY_ID} PROXY_ID: ${DNPM_PROXY_ID}
APP_0_ID: dnpm-connect APP_dnpm-connect_KEY: ${DNPM_BEAM_SECRET_SHORT}
APP_0_KEY: ${DNPM_BEAM_SECRET_SHORT}
PRIVKEY_FILE: /run/secrets/proxy.pem PRIVKEY_FILE: /run/secrets/proxy.pem
ALL_PROXY: http://forward_proxy:3128 ALL_PROXY: http://forward_proxy:3128
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs

View File

@ -3,9 +3,7 @@ version: "3.7"
services: services:
beam-proxy: beam-proxy:
environment: environment:
APP_3_ID: dnpm-connect APP_dnpm-connect_KEY: ${DNPM_BEAM_SECRET_SHORT}
APP_3_KEY: ${DNPM_BEAM_SECRET_SHORT}
dnpm-beam-connect: dnpm-beam-connect:
depends_on: [ beam-proxy ] depends_on: [ beam-proxy ]
image: docker.verbis.dkfz.de/cache/samply/beam-connect:dnpm image: docker.verbis.dkfz.de/cache/samply/beam-connect:dnpm

View File

@ -7,8 +7,7 @@ services:
environment: environment:
BROKER_URL: ${DNPM_BROKER_URL} BROKER_URL: ${DNPM_BROKER_URL}
PROXY_ID: ${DNPM_PROXY_ID} PROXY_ID: ${DNPM_PROXY_ID}
APP_0_ID: dnpm-connect APP_dnpm-connect_KEY: ${DNPM_BEAM_SECRET_SHORT}
APP_0_KEY: ${DNPM_BEAM_SECRET_SHORT}
PRIVKEY_FILE: /run/secrets/proxy.pem PRIVKEY_FILE: /run/secrets/proxy.pem
ALL_PROXY: http://forward_proxy:3128 ALL_PROXY: http://forward_proxy:3128
TLS_CA_CERTIFICATES_DIR: ./conf/trusted-ca-certs TLS_CA_CERTIFICATES_DIR: ./conf/trusted-ca-certs