From 66d462997822159a1bd250428ca0492bf0a5982f Mon Sep 17 00:00:00 2001
From: root <root@e260-nb015.inet.dkfz-heidelberg.de>
Date: Fri, 15 Dec 2023 12:30:14 +0100
Subject: [PATCH] Integrating cbioportal

---
 ccp/modules/cbioportal-compose.yml | 39 ++++++++++++++++++------------
 ccp/modules/cbioportal-setup.sh    |  6 ++---
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/ccp/modules/cbioportal-compose.yml b/ccp/modules/cbioportal-compose.yml
index 08d49a8..35a7f92 100644
--- a/ccp/modules/cbioportal-compose.yml
+++ b/ccp/modules/cbioportal-compose.yml
@@ -1,22 +1,29 @@
 version: '3.7'
 
 services:
-#  cbioportal:
-#    image: docker.verbis.dkfz.de/ccp/dktk-cbioportal:latest
-#    container_name: bridgehead-cbioportal
-#    environment:
-#      DB_PASSWORD: ${CBIOPORTAL_DB_PASSWORD}
-#    depends_on:
-#     - cbioportal-database
-#     - cbioportal-session
-#    labels:
-#      - "traefik.enable=true"
-#      - "traefik.http.routers.cbioportal.rule=PathPrefix(`/cbioportal`)"
-#      - "traefik.http.services.cbioportal.loadbalancer.server.port=8080"
-#      - "traefik.http.routers.cbioportal.tls=true"
-#      - "traefik.http.routers.cbioportal-update.rule=PathPrefix(`/cbioportal-update`)"
-#      - "traefik.http.services.cbioportal-update.loadbalancer.server.port=8001"
-#      - "traefik.http.routers.cbioportal-update.tls=true"
+  cbioportal:
+    #image: docker.verbis.dkfz.de/ccp/dktk-cbioportal:latest
+    image: dktk-cbioportal
+    container_name: bridgehead-cbioportal
+    environment:
+      DB_PASSWORD: ${CBIOPORTAL_DB_PASSWORD}
+      HTTP_RELATIVE_PATH: "/cbioportal"
+      UPLOAD_HTTP_RELATIVE_PATH: "/cbioportal-upload"
+    depends_on:
+      - cbioportal-database
+      - cbioportal-session
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.cbioportal.rule=PathPrefix(`/cbioportal`)"
+      - "traefik.http.routers.cbioportal.service=cbioportal
+      - "traefik.http.services.cbioportal.loadbalancer.server.port=8080"
+      - "traefik.http.routers.cbioportal.tls=true"
+      - "traefik.http.routers.cbioportal-upload.rule=PathPrefix(`/cbioportal-upload`)"    
+      - "traefik.http.routers.cbioportal-upload.service=cbioportal-upload
+      - "traefik.http.routers.cbioportal-upload.tls=true"
+      - "traefik.http.services.cbioportal-upload.loadbalancer.server.port=8001" 
+      
+      
 
   cbioportal-database:
     #image: docker.verbis.dkfz.de/ccp/dktk-cbioportal-database:latest
diff --git a/ccp/modules/cbioportal-setup.sh b/ccp/modules/cbioportal-setup.sh
index 10b3d6a..0f4e621 100644
--- a/ccp/modules/cbioportal-setup.sh
+++ b/ccp/modules/cbioportal-setup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
-if [ "$ENABLE_CBIOPORTAL" == true ]; then
+# if [ "$ENABLE_CBIOPORTAL" == true ]; then
   log INFO "cBioPortal setup detected -- will start cBioPortal service."
   OVERRIDE+=" -f ./$PROJECT/modules/cbioportal-compose.yml"
   CBIOPORTAL_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for the cbioportal database. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
-  CBIOPORTAL_DB_ROOT_PASSWORD="$(echo \"This is a salt string to generate one consistent root password for the cbioportal database. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 64)"
-fi
+  CBIOPORTAL_DB_ROOT_PASSWORD="$(echo \"This is a salt string to generate one consistent root password for the cbioportal database. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 64)" 
+# fi