Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set environment variables needed for the focus blaze-and-sql endpoint to work when fhir2sql is enabled #246

Merged
merged 10 commits into from
Dec 11, 2024
Merged

set environment variables needed for the focus blaze-and-sql endpoint to work when fhir2sql is enabled #246

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
760d599
Add CCP-PPI
patrickskowronekdkfz Oct 10, 2024
8e7fe68
fix: use correct mainzelliste api key
patrickskowronekdkfz Oct 10, 2024
2398106
Move ppi to id-management
patrickskowronekdkfz Oct 10, 2024
26712d3
feat: add and set FOCUS_ENDPOINT_TYPE to support fhir2sql (#244)
davidmscholz Oct 30, 2024
52c24ee
fix(fhir2sql): add the postgres connection string to focus (#245)
Threated Nov 5, 2024
8cd5b93
Merge pull request #237 from samply/feat/ccp-ppi
TKussel Nov 5, 2024
967e456
Add exporter configuration to focus (#249)
djuarezgf Nov 5, 2024
122ff16
fix: use verbis cache image instead of docker-hub (#250)
patrickskowronekdkfz Nov 12, 2024
45aefd2
renamed exporter API key to EXPORTER_API_KEY (#252)
enola-dkfz Dec 6, 2024
e351036
fix: remove credentials from git remote, if update fails (#253)
patrickskowronekdkfz Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ccp/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ services:
RETRY_COUNT: ${FOCUS_RETRY_COUNT}
EPSILON: 0.28
QUERIES_TO_CACHE: '/queries_to_cache.conf'
ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze}
volumes:
- /srv/docker/bridgehead/ccp/queries_to_cache.conf:/queries_to_cache.conf
depends_on:
Expand All @@ -58,7 +59,6 @@ services:
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
- /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro


volumes:
blaze-data:

Expand Down
4 changes: 4 additions & 0 deletions ccp/modules/fhir2sql-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ services:
POSTGRES_DB: "dashboard"
volumes:
- "/var/cache/bridgehead/ccp/dashboard-db:/var/lib/postgresql/data"

focus:
environment:
POSTGRES_CONNECTION_STRING: "postgresql://dashboard:${DASHBOARD_DB_PASSWORD}@dashboard-db/dashboard"
1 change: 1 addition & 0 deletions ccp/modules/fhir2sql-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ if [ "$ENABLE_FHIR2SQL" == true ]; then
log INFO "Dashboard setup detected -- will start Dashboard backend and FHIR2SQL service."
OVERRIDE+=" -f ./$PROJECT/modules/fhir2sql-compose.yml"
DASHBOARD_DB_PASSWORD="$(generate_simple_password 'fhir2sql')"
FOCUS_ENDPOINT_TYPE="blaze-and-sql"
fi
7 changes: 7 additions & 0 deletions ccp/modules/id-management-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,12 @@ services:
forward_proxy:
condition: service_healthy

ccp-patient-project-identificator:
image: samply/ccp-patient-project-identificator
container_name: bridgehead-ccp-patient-project-identificator
environment:
MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
SITE_NAME: ${SITE_NAME}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be in this PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would appreciate if this could make it into main with this PR. But we can move it to the next merge. It would add the PPI and it should not break anything.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like it to be in a different PR for transparency reasons. However, we could merge them at the same-ish time.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ccp-patient-project-identificator:
image: samply/ccp-patient-project-identificator
container_name: bridgehead-ccp-patient-project-identificator
environment:
MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
SITE_NAME: ${SITE_NAME}

agreed, move to different PR

volumes:
patientlist-db-data: