Make sure that docker entrypoint works for integration tests

pvannierop · Aug 22, 2023 · cc879f2 · cc879f2
1 parent f91d0fd
commit cc879f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -42,8 +42,11 @@ jobs:
         working-directory: ./cbioportal-docker-compose
         run: |
           cd ./data && ./init.sh && rm -rf ./studies/* && cd ../config && \
-          cat $PORTAL_SOURCE_DIR/portal/target/portal/WEB-INF/classes/portal.properties | \
-              sed 's|db.connection_string=.*|db.connection_string=jdbc:mysql://cbioportal-database:3306/cbioportal?useSSL=false|g' \
+          cat $PORTAL_SOURCE_DIR/portal/target/classes/portal.properties | \
+              sed 's|db.host=.*||' | \
+              sed 's|db.portal_db_name=.*||' | \
+              sed 's|db.use_ssl=.*||' | \
+              sed 's|db.connection_string=.*|db.connection_string=jdbc:mysql://cbioportal-database:3306/cbioportal?useSSL=false&allowPublicKeyRetrieval=true|' \
               > portal.properties
       - name: 'Start cbioportal-docker-compose'
         working-directory: ./cbioportal-docker-compose

diff --git a/docker/web-and-data/docker-entrypoint.sh b/docker/web-and-data/docker-entrypoint.sh
@@ -114,7 +114,7 @@ _main() {
         # available, otherwise use portal.properties
         if [ -n "$SHOW_DEBUG_INFO" ] && [ "$SHOW_DEBUG_INFO" != "false" ]; then
             echo "Using database config:"
-            #parse_db_params_from_config_and_command_line $@
+            parse_db_params_from_config_and_command_line $@
         fi
 
         check_db_connection $@

diff --git a/test/integration/docker-compose-localbuild.yml b/test/integration/docker-compose-localbuild.yml
@@ -13,3 +13,5 @@ services:
      # and running
      - $PORTAL_SOURCE_DIR:/cbioportal/
      - $PORTAL_SOURCE_DIR/portal/target/cbioportal.war:/app.war
+     # TODO: remove line below after upgrade of cbioportal-docker-compose to > v5.3.20
+     - $PORTAL_SOURCE_DIR/docker/web-and-data/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh