Skip to content

Commit f3e9177

Browse files
authored
Update CGDS and force keycloak db to mysql 5 (#5036)
1 parent 8d6511c commit f3e9177

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
version: '3'
1+
version: "3"
22

33
services:
44
cbioportal:
55
volumes:
66
- $TEST_HOME/docker_compose/keycloak/localdb.crt:/cbioportal-webapp/local.crt:ro
77
- $TEST_HOME/docker_compose/keycloak/localdb.key:/cbioportal-webapp/local.key
88
- $E2E_WORKSPACE/keycloak/idp-metadata.xml:/cbioportal-webapp/client-tailored-saml-idp-metadata.xml:ro
9-
command: >
10-
/bin/sh -c "java -Xms2g -Xmx4g -cp '/cbioportal-webapp:/cbioportal-webapp/lib/*' org.cbioportal.PortalApplication --spring.config.location=cbioportal-webapp/application.properties --dat.method=none --multithread.core_pool_size=1
9+
command: >
10+
/bin/sh -c "java -Xms2g -Xmx4g -cp '/cbioportal-webapp:/cbioportal-webapp/lib/*' org.cbioportal.PortalApplication --spring.config.location=cbioportal-webapp/application.properties --dat.method=none --multithread.core_pool_size=1
1111
--authenticate=saml --spring.security.saml2.relyingparty.registration.cbio-idp.assertingparty.metadata-uri=classpath:/client-tailored-saml-idp-metadata.xml --session.service.url=http://cbioportal-session:5000/api/sessions/my_portal/
1212
--spring.security.saml2.relyingparty.registration.cbio-idp.entity-id=cbioportal --spring.security.saml2.relyingparty.registration.cbio-idp.signing.credentials[0].certificate-location=classpath:/local.crt
1313
--spring.security.saml2.relyingparty.registration.cbio-idp.signing.credentials[0].private-key-location=classpath:/local.key"
1414
keycloak:
1515
networks:
16-
- cbio-net
16+
- cbio-net
1717
container_name: keycloak
1818
image: quay.io/keycloak/keycloak:11.0.3
1919
restart: unless-stopped
2020
depends_on:
21-
- kcdb
21+
- kcdb
2222
ports:
23-
- "8081:8080"
23+
- "8081:8080"
2424
environment:
25-
- DB_VENDOR=mysql
26-
- DB_ADDR=kcdb
27-
- DB_USER=keycloak
28-
- DB_PORT=3306
29-
- DB_PASSWORD=password
30-
- DB_DATABASE=keycloak
31-
- KEYCLOAK_USER=admin
32-
- KEYCLOAK_PASSWORD=admin
33-
- JDBC_PARAMS=${KEYCLOAK_JDBC_PARAMS:-useSSL=false&serverTimezone=UTC}
25+
- DB_VENDOR=mysql
26+
- DB_ADDR=kcdb
27+
- DB_USER=keycloak
28+
- DB_PORT=3306
29+
- DB_PASSWORD=password
30+
- DB_DATABASE=keycloak
31+
- KEYCLOAK_USER=admin
32+
- KEYCLOAK_PASSWORD=admin
33+
- JDBC_PARAMS=${KEYCLOAK_JDBC_PARAMS:-useSSL=false&serverTimezone=UTC}
3434

3535
kcdb:
3636
networks:
37-
- cbio-net
38-
image: ${DOCKER_IMAGE_MYSQL}
37+
- cbio-net
38+
image: mysql:5.7
3939
container_name: kcdb
4040
restart: unless-stopped
4141
volumes:
42-
- $E2E_WORKSPACE/kc_db_data:/var/lib/mysql
42+
- $E2E_WORKSPACE/kc_db_data:/var/lib/mysql
4343
environment:
4444
- MYSQL_ROOT_PASSWORD=root_password
4545
- MYSQL_USER=keycloak
4646
- MYSQL_PASSWORD=password
4747
- MYSQL_DATABASE=keycloak
4848
command: --ssl=0 --lower_case_table_names=1
4949
networks:
50-
cbio-net:
50+
cbio-net:

end-to-end-test/local/runtime-config/setup_environment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SPEC_FILE_PATTERN=./local/specs/**/*.spec.js
1414
echo export CBIO_DB_DATA_DIR=$E2E_WORKSPACE/cbio_db_data
1515
echo export KC_DB_DATA_DIR=$E2E_WORKSPACE/kc_db_data
1616

17-
echo export DB_CGDS_URL=https://raw.githubusercontent.com/cBioPortal/cbioportal/v5.3.6/db-scripts/src/main/resources/cgds.sql
17+
echo export DB_CGDS_URL=https://raw.githubusercontent.com/cBioPortal/cbioportal/refs/tags/v6.0.17/src/main/resources/db-scripts/cgds.sql
1818
echo export DB_SEED_URL=https://raw.githubusercontent.com/cBioPortal/datahub/master/seedDB/seedDB_hg19_archive/seed-cbioportal_hg19_v2.12.14.sql.gz
1919

2020
# -+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-

0 commit comments

Comments
 (0)