samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix dashboard-compose

This commit is contained in:
davidmscholz 2024-07-30 09:24:07 +02:00
parent df08d67839
commit 5ed07423f3
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccp/modules/dashboard-compose.yml
View File

@ -4,10 +4,11 @@ services:
fhir2sql: fhir2sql:
depends_on: depends_on:
- "dashboard-db" - "dashboard-db"
- [ blaze ]
image: docker.verbis.dkfz.de/cache/samply/fhir2sql:latest image: docker.verbis.dkfz.de/cache/samply/fhir2sql:latest
container_name: bridgehead-ccp-dashboard-fhir2sql container_name: bridgehead-ccp-dashboard-fhir2sql
environment: environment:
BLAZE_BASE_URL: "http://blaze:8080/fhir/" BLAZE_BASE_URL: "http://bridgehead-ccp-blaze:8080"
PG_HOST: "dashboard-db" PG_HOST: "dashboard-db"
PG_USERNAME: "dashboard" PG_USERNAME: "dashboard"
PG_PASSWORD: "${DASHBOARD_DB_PASSWORD}" # Set in dashboard-setup.sh PG_PASSWORD: "${DASHBOARD_DB_PASSWORD}" # Set in dashboard-setup.sh

2
ccp/modules/dashboard-setup.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -e #!/bin/bash -e
if [ "$ENABLE_DASHBOARD" == true ]; then if [ "$ENABLE_FHIR2SQL" == true ]; then
log INFO "Dashboard setup detected -- will start Dashboard backend and FHIR2SQL service." log INFO "Dashboard setup detected -- will start Dashboard backend and FHIR2SQL service."
OVERRIDE+=" -f ./$PROJECT/modules/dashboard-compose.yml" OVERRIDE+=" -f ./$PROJECT/modules/dashboard-compose.yml"
DASHBOARD_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for the Dashboard database. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" DASHBOARD_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for the Dashboard database. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"

2
ccp/modules/dashboard.md
View File

@ -33,4 +33,4 @@ The volume used by dashboard-db can be removed safely and should be restored to
### Setup ### Setup
To enable the Dashboard module, set the ENABLE_DASHBOARD environment variable to true. The dashboard-setup.sh script will then start the fhir2sql and dashboard-db services, using the environment variables and volumes defined above. To enable the Dashboard module, set the ENABLE_FHIR2SQL environment variable to true. The dashboard-setup.sh script will then start the fhir2sql and dashboard-db services, using the environment variables and volumes defined above.