Update to docker entrypoint and docker compose

Update web and docker entry point Update localbuild to use exec
cBioPortal · Nov 7, 2023 · f0e48b4 · f0e48b4
1 parent 798f9c2
commit f0e48b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docker/web-and-data/docker-entrypoint.sh b/docker/web-and-data/docker-entrypoint.sh
@@ -2,8 +2,8 @@
 set -eo pipefail
 shopt -s nullglob
 
-BAKED_IN_WAR_CONFIG_FILE=/cbioportal-webapp/WEB-INF/classes/portal.properties
-CUSTOM_PROPERTIES_FILE=cbioportal/portal.properties
+BAKED_IN_WAR_CONFIG_FILE=/cbioportal-webapp/WEB-INF/classes/application.properties
+CUSTOM_PROPERTIES_FILE=cbioportal/application.properties
 
 # check to see if this file is being run or sourced from another script
 _is_sourced() {
@@ -100,9 +100,9 @@ migrate_db() {
     POTENTIAL_DB_PARAMS=$@
 
     if [[ -f $CUSTOM_PROPERTIES_FILE ]]; then
-        python3 /cbioportal/core/src/main/scripts/migrate_db.py -y -p $CUSTOM_PROPERTIES_FILE -s /cbioportal/db-scripts/src/main/resources/migration.sql
+        python3 /cbioportal/core/src/main/resources/scripts/migrate_db.py -y -p $CUSTOM_PROPERTIES_FILE -s /cbioportal/src/main/resources/db-scripts/migration.sql
     else
-        python3 /cbioportal/core/src/main/scripts/migrate_db.py -y -p <(parse_db_params_from_config_and_command_line $POTENTIAL_DB_PARAMS) -s /cbioportal/db-scripts/src/main/resources/migration.sql
+        python3 /cbioportal/core/src/main/resources/scripts/migrate_db.py -y -p <(parse_db_params_from_config_and_command_line $POTENTIAL_DB_PARAMS) -s /cbioportal/src/main/resources/db-scripts/migration.sql
     fi
 }
 

diff --git a/test/integration/docker-compose-localbuild.yml b/test/integration/docker-compose-localbuild.yml
@@ -12,5 +12,5 @@ services:
      # by volume mounting the local portal source folder into the container
      # and running
      - $PORTAL_SOURCE_DIR:/cbioportal/
-     - $PORTAL_SOURCE_DIR/target/cbioportal.jar:/cbioportal.jar
+     - $PORTAL_SOURCE_DIR/target/cbioportal-exec.jar:/cbioportal-exec.jar
      - $PORTAL_SOURCE_DIR/docker/web-and-data/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh