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

Changed: to use the generated passwords from cbioportal-setup.sh. Removed: local database files (they have been added in the database image named bridgehead-cbioportal-database)

This commit is contained in:
root 2024-06-04 12:11:14 +02:00
parent dceac37810
commit 0ca5ad76f1
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ccp/modules/cbioportal-compose.yml
View File

@ -2,12 +2,16 @@ version: '3.7'
services: services:
cbioportal: cbioportal:
image: docker.verbis.dkfz.de/ccp/dktk-cbioportal:latest # image: docker.verbis.dkfz.de/ccp/dktk-cbioportal:latest
image: bridgehead-cbioportal
container_name: bridgehead-cbioportal container_name: bridgehead-cbioportal
environment: environment:
DB_PASSWORD: ${CBIOPORTAL_DB_PASSWORD} DB_PASSWORD: ${CBIOPORTAL_DB_PASSWORD}
# DB_PASSWORD: "password1234"
HTTP_RELATIVE_PATH: "/cbioportal" HTTP_RELATIVE_PATH: "/cbioportal"
UPLOAD_HTTP_RELATIVE_PATH: "/cbioportal-upload" UPLOAD_HTTP_RELATIVE_PATH: "/cbioportal-upload"
UPLOAD_FOLDER: "/app/uploads"
EXTRACTED_FOLDER: "/app/study"
depends_on: depends_on:
- cbioportal-database - cbioportal-database
- cbioportal-session - cbioportal-session
@ -22,19 +26,21 @@ services:
- "traefik.http.routers.cbioportal-upload.tls=true" - "traefik.http.routers.cbioportal-upload.tls=true"
- "traefik.http.services.cbioportal-upload.loadbalancer.server.port=8001" - "traefik.http.services.cbioportal-upload.loadbalancer.server.port=8001"
cbioportal-database: cbioportal-database:
image: docker.verbis.dkfz.de/ccp/dktk-cbioportal-database:latest restart: unless-stopped
# image: docker.verbis.dkfz.de/ccp/dktk-cbioportal-database:latest
image: bridgehead-cbioportal-database
container_name: bridgehead-cbioportal-database container_name: bridgehead-cbioportal-database
environment: environment:
MYSQL_DATABASE: cbioportal MYSQL_DATABASE: "cbioportal"
MYSQL_USER: cbio_user MYSQL_USER: "cbio_user"
MYSQL_PASSWORD: ${CBIOPORTAL_DB_PASSWORD} MYSQL_PASSWORD: ${CBIOPORTAL_DB_PASSWORD}
MYSQL_ROOT_PASSWORD: ${CBIOPORTAL_DB_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${CBIOPORTAL_DB_ROOT_PASSWORD}
# MYSQL_PASSWORD: "password1234"
# MYSQL_ROOT_PASSWORD: "password12"
volumes: volumes:
- /var/cache/bridgehead/ccp/cbioportal_db_data:/var/lib/mysql - /var/cache/bridgehead/ccp/cbioportal_db_data:/var/lib/mysql
cbioportal-session: cbioportal-session:
image: cbioportal/session-service:0.6.1 image: cbioportal/session-service:0.6.1
container_name: bridgehead-cbioportal-session container_name: bridgehead-cbioportal-session

2
ccp/modules/cbioportal-setup.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
ENABLE_CBIOPORTAL=true
if [ "$ENABLE_CBIOPORTAL" == true ]; then if [ "$ENABLE_CBIOPORTAL" == true ]; then
log INFO "cBioPortal setup detected -- will start cBioPortal service." log INFO "cBioPortal setup detected -- will start cBioPortal service."
OVERRIDE+=" -f ./$PROJECT/modules/cbioportal-compose.yml" OVERRIDE+=" -f ./$PROJECT/modules/cbioportal-compose.yml"