samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework commented sections

This commit is contained in:
lablans 2023-09-15 08:14:12 +00:00 committed by juarez
parent b5ca5ea4a7
commit f38d9f8c19
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ccp/modules/datashield-compose.yml
View File

@ -1,12 +1,11 @@
version: "3.7" version: "3.7"
services: services:
############################################ DataSHIELD Client (Rocker R-Studio)
rstudio: rstudio:
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:
#DEFAULT_USER: "rstudio" # Please, don't remove this line. It is informative. #DEFAULT_USER: "rstudio" # This line is kept for informational purposes
PASSWORD: "${LDM_AUTH}" PASSWORD: "${LDM_AUTH}"
HTTP_RELATIVE_PATH: "/rstudio" HTTP_RELATIVE_PATH: "/rstudio"
labels: labels:
@ -16,11 +15,7 @@ services:
- "traefik.http.routers.rstudio_ccp.tls=true" - "traefik.http.routers.rstudio_ccp.tls=true"
- "traefik.http.middlewares.rstudio_ccp_strip.stripprefix.prefixes=/rstudio" - "traefik.http.middlewares.rstudio_ccp_strip.stripprefix.prefixes=/rstudio"
- "traefik.http.routers.rstudio_ccp.middlewares=rstudio_ccp_strip" - "traefik.http.routers.rstudio_ccp.middlewares=rstudio_ccp_strip"
#volumes:
#- "bridgehead-rstudio-config:/home/rstudio/.config/rstudio"
#- "bridgehead-rstudio-workspace:/home/rstudio/workspace"
############################################ DataSHIELD Server (Opal)
opal: opal:
container_name: bridgehead-opal container_name: bridgehead-opal
image: docker.verbis.dkfz.de/ccp/dktk-opal:latest image: docker.verbis.dkfz.de/ccp/dktk-opal:latest
@ -34,7 +29,7 @@ services:
- opal-db - opal-db
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" # This line is kept for informational purposes
OPAL_ADMINISTRATOR_PASSWORD: "${LDM_AUTH}" OPAL_ADMINISTRATOR_PASSWORD: "${LDM_AUTH}"
POSTGRESDATA_HOST: "opal-db" POSTGRESDATA_HOST: "opal-db"
POSTGRESDATA_DATABASE: "opal" POSTGRESDATA_DATABASE: "opal"
@ -49,19 +44,13 @@ services:
- opal-cert.pem - opal-cert.pem
- opal-key.pem - opal-key.pem
# volumes: opal-db:
# - "bridgehead-opal:/srv"
opal-db: # Data
container_name: bridgehead-opal-db container_name: bridgehead-opal-db
image: docker.verbis.dkfz.de/cache/postgres:15.1-alpine image: docker.verbis.dkfz.de/cache/postgres:15.1-alpine
environment: environment:
POSTGRES_PASSWORD: "${OPAL_DB_PASSWORD}" # Set in datashield-setup.sh POSTGRES_PASSWORD: "${OPAL_DB_PASSWORD}" # Set in datashield-setup.sh
POSTGRES_USER: "opal" POSTGRES_USER: "opal"
POSTGRES_DB: "opal" POSTGRES_DB: "opal"
# Please evaluate if this volume makes sense. An import can take several hours. If the bridgehead is restarted,
# the data should be reimported again.
volumes: volumes:
- "/var/cache/bridgehead/opal-db:/var/lib/postgresql/data" - "/var/cache/bridgehead/opal-db:/var/lib/postgresql/data"
@ -90,16 +79,6 @@ services:
environment: environment:
APP_datashield-connect_KEY: ${DATASHIELD_CONNECT_SECRET} APP_datashield-connect_KEY: ${DATASHIELD_CONNECT_SECRET}
#volumes:
# bridgehead-rstudio-config:
# name: "bridgehead-rstudio-config"
# bridgehead-rstudio-workspace:
# name: "bridgehead-rstudio-workspace"
# bridgehead-opal-db:
# name: "bridgehead-opal-db"
# bridgehead-opal:
# name: "bridgehead-opal"
secrets: secrets:
opal-cert.pem: opal-cert.pem:
file: /tmp/bridgehead/opal-cert.pem file: /tmp/bridgehead/opal-cert.pem