Remove demo-rfc72 dockerImage from localdb tests (cBioPortal#4805)

fix that should have been in original merge of rfc72
gblaih · Dec 18, 2023 · f1ef713 · f1ef713
1 parent 26ca790
commit f1ef713
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 9 deletions.
diff --git a/end-to-end-test/local/docker_compose/cbioportal-custombranch.yml b/end-to-end-test/local/docker_compose/cbioportal-custombranch.yml
@@ -2,7 +2,6 @@ version: '3'
 
 services:
   cbioportal:
-    image: cbioportal/cbioportal:demo-rfc72
     volumes:
       - $E2E_WORKSPACE/cbioportal:/cbioportal
       - $TEST_HOME/runtime-config/portal.properties:/cbioportal/application.properties:ro

diff --git a/end-to-end-test/local/docker_compose/cbioportal.yml b/end-to-end-test/local/docker_compose/cbioportal.yml
@@ -2,7 +2,6 @@ version: '3'
 
 services:
   cbioportal:
-    image: cbioportal/cbioportal:demo-rfc72
     environment:
       # TODO: properties need to be in both PORTAL_HOME and
       # PORTAL_WEB_HOME. Db connection failes if the properties are not in

diff --git a/end-to-end-test/local/docker_compose/initdb.sh b/end-to-end-test/local/docker_compose/initdb.sh
@@ -4,8 +4,6 @@ set -e
 set -u # unset variables throw error
 set -o pipefail # pipes fail when partial command fails
 
-echo export DOCKER_IMAGE_CBIOPORTAL=cbioportal/cbioportal:demo-rfc72
-
 DIR=$PWD
 
 cd $E2E_WORKSPACE/cbioportal-docker-compose

diff --git a/end-to-end-test/local/docker_compose/keycloak.yml b/end-to-end-test/local/docker_compose/keycloak.yml
@@ -2,7 +2,6 @@ version: '3'
 
 services:
   cbioportal:
-    image: cbioportal/cbioportal:demo-rfc72
     volumes:
       - $TEST_HOME/docker_compose/keycloak/localdb.crt:/cbioportal-webapp/local.crt:ro
       - $TEST_HOME/docker_compose/keycloak/localdb.key:/cbioportal-webapp/local.key

diff --git a/end-to-end-test/local/docker_compose/start.sh b/end-to-end-test/local/docker_compose/start.sh
@@ -5,8 +5,6 @@ set -u # unset variables throw error
 set -o pipefail # pipes fail when partial command fails
 shopt -s nullglob # allows files and dir globs to be null - needed in 'for ... do' loops that should not run when no files/dirs are detected by expansion
 
-echo export DOCKER_IMAGE_CBIOPORTAL=cbioportal/cbioportal:demo-rfc72
-
 DIR=$PWD
 
 cd $E2E_WORKSPACE/cbioportal-docker-compose

diff --git a/env/custom.sh b/env/custom.sh
@@ -1,3 +1,2 @@
 #export CBIOPORTAL_URL="http://localhost:8081"
 #export GENOME_NEXUS_URL="https://www.genomenexus.org"
-export BACKEND=cbioportal:demo-rfc72
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
@@ -46,7 +46,7 @@ export DB_DATA_DIR=$E2E_WORKSPACE/cbio_db_data
 
 cd $PORTAL_SOURCE_DIR
 
-export BACKEND=cbioportal:demo-rfc72
+export BACKEND=cbioportal:master
 export BRANCH_ENV="http://localhost:8080"
 export GENOME_NEXUS_URL="https://www.genomenexus.org"