From e61071103bd7f827ef78341fe7564ea216defe95 Mon Sep 17 00:00:00 2001 From: juarez Date: Mon, 4 Sep 2023 15:15:34 +0200 Subject: [PATCH] Bugfix: LDM_AUTH instead of LDM_PASSWORD --- ccp/modules/datashield-compose.yml | 4 ++-- ccp/modules/exporter-compose.yml | 2 +- ccp/modules/login-compose.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml index bd01070..36c26ad 100644 --- a/ccp/modules/datashield-compose.yml +++ b/ccp/modules/datashield-compose.yml @@ -5,7 +5,7 @@ services: image: docker.verbis.dkfz.de/ccp/dktk-rstudio:latest environment: #DEFAULT_USER: "rstudio" # Please, don't remove this line. It is informative. - PASSWORD: "${LDM_PASSWORD}" + PASSWORD: "${LDM_AUTH}" HTTP_RELATIVE_PATH: "/rstudio" labels: - "traefik.enable=true" @@ -33,7 +33,7 @@ services: environment: JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC" # OPAL_ADMINISTRATOR_USER: "administrator" # Please, don't remove this line. It is informative. - OPAL_ADMINISTRATOR_PASSWORD: "${LDM_PASSWORD}" + OPAL_ADMINISTRATOR_PASSWORD: "${LDM_AUTH}" POSTGRESDATA_HOST: "opal-db" POSTGRESDATA_DATABASE: "opal" POSTGRESDATA_USER: "opal" diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index 5134f66..81f3a78 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -13,7 +13,7 @@ services: HTTP_RELATIVE_PATH: "/ccp-exporter" SITE: "${SITE_ID}" HTTP_SERVLET_REQUEST_SCHEME: "https" - OPAL_ADMINISTRATOR_PASSWORD: "${LDM_PASSWORD}" + OPAL_ADMINISTRATOR_PASSWORD: "${LDM_AUTH}" labels: - "traefik.enable=true" - "traefik.http.routers.exporter_ccp.rule=PathPrefix(`/ccp-exporter`)" diff --git a/ccp/modules/login-compose.yml b/ccp/modules/login-compose.yml index ec5688c..569d8f5 100644 --- a/ccp/modules/login-compose.yml +++ b/ccp/modules/login-compose.yml @@ -17,9 +17,9 @@ services: container_name: bridgehead-login environment: KEYCLOAK_ADMIN: "admin" - KEYCLOAK_ADMIN_PASSWORD: "${LDM_PASSWORD}" + KEYCLOAK_ADMIN_PASSWORD: "${LDM_AUTH}" TEILER_ADMIN: "${PROJECT}" - TEILER_ADMIN_PASSWORD: "${LDM_PASSWORD}" + TEILER_ADMIN_PASSWORD: "${LDM_AUTH}" TEILER_ADMIN_FIRST_NAME: "${OPERATOR_FIRST_NAME}" TEILER_ADMIN_LAST_NAME: "${OPERATOR_LAST_NAME}" TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}"