Use LDM_PASSWORD for all admin passwords

This commit is contained in:
Martin Lablans 2023-08-04 15:29:40 +02:00 committed by juarez
parent 840096d1d5
commit 73d969e374
3 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@ services:
container_name: bridgehead-rstudio container_name: bridgehead-rstudio
image: docker.verbis.dkfz.de/ccp/dktk-rstudio:latest image: docker.verbis.dkfz.de/ccp/dktk-rstudio:latest
environment: environment:
USER: "ruser" USER: "${PROJECT}"
PASSWORD: "${RSTUDIO_PASSWORD}" PASSWORD: "${RSTUDIO_PASSWORD}"
HTTP_RELATIVE_PATH: "/rstudio" HTTP_RELATIVE_PATH: "/rstudio"
labels: labels:
@ -33,7 +33,7 @@ services:
environment: environment:
JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC" JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC"
# OPAL_ADMINISTRATOR_USER: "administrator" # Please, don't remove this line. It is informative. # OPAL_ADMINISTRATOR_USER: "administrator" # Please, don't remove this line. It is informative.
OPAL_ADMINISTRATOR_PASSWORD: "${OPAL_ADMINISTRATOR_PASSWORD}" OPAL_ADMINISTRATOR_PASSWORD: "${LDM_PASSWORD}"
POSTGRESDATA_HOST: "opal-db" POSTGRESDATA_HOST: "opal-db"
POSTGRESDATA_DATABASE: "opal" POSTGRESDATA_DATABASE: "opal"
POSTGRESDATA_USER: "opal" POSTGRESDATA_USER: "opal"

View File

@ -15,7 +15,7 @@ services:
WRITE_FILES_LIFETIME_IN_DAYS: "30" WRITE_FILES_LIFETIME_IN_DAYS: "30"
HTTP_RELATIVE_PATH: "/ccp-exporter" HTTP_RELATIVE_PATH: "/ccp-exporter"
HTTP_SERVLET_REQUEST_SCHEME: "https" HTTP_SERVLET_REQUEST_SCHEME: "https"
OPAL_ADMINISTRATOR_PASSWORD: "${OPAL_ADMINISTRATOR_PASSWORD}" OPAL_ADMINISTRATOR_PASSWORD: "${LDM_PASSWORD}"
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.exporter_ccp.rule=PathPrefix(`/ccp-exporter`)" - "traefik.http.routers.exporter_ccp.rule=PathPrefix(`/ccp-exporter`)"

View File

@ -15,7 +15,7 @@ services:
container_name: bridgehead-login container_name: bridgehead-login
environment: environment:
KEYCLOAK_ADMIN: "admin" KEYCLOAK_ADMIN: "admin"
KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD}" KEYCLOAK_ADMIN_PASSWORD: "${LDM_PASSWORD}"
KC_DB_PASSWORD: "${KEYCLOAK_DB_PASSWORD}" # Set in teiler-setup.sh KC_DB_PASSWORD: "${KEYCLOAK_DB_PASSWORD}" # Set in teiler-setup.sh
KC_HOSTNAME_URL: "https://${HOST}/login" KC_HOSTNAME_URL: "https://${HOST}/login"
KC_HOSTNAME_STRICT: "false" KC_HOSTNAME_STRICT: "false"