From 4658a115c2b9383d166ba98f5ecda3184fbfb5e6 Mon Sep 17 00:00:00 2001 From: Martin Jurk Date: Mon, 16 Feb 2026 10:31:54 +0100 Subject: [PATCH] clean up --- itcc/docker-compose.yml | 4 ++-- itcc/modules/itcc-omics-ingest.yaml | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/itcc/docker-compose.yml b/itcc/docker-compose.yml index 49edff0a..336cc80c 100644 --- a/itcc/docker-compose.yml +++ b/itcc/docker-compose.yml @@ -32,7 +32,7 @@ services: BEAM_PROXY_URL: http://beam-proxy:8081 RETRY_COUNT: ${FOCUS_RETRY_COUNT} EPSILON: 0.28 - QUERIES_TO_CACHE: '/queries_to_cache.conf' + QUERIES_TO_CACHE: "/queries_to_cache.conf" ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze} volumes: - /srv/docker/bridgehead/itcc/queries_to_cache.conf:/queries_to_cache.conf:ro @@ -47,6 +47,7 @@ services: BROKER_URL: ${BROKER_URL} PROXY_ID: ${PROXY_ID} APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT} + APP_omics-endpoint_KEY: ${FOCUS_BEAM_SECRET_SHORT} PRIVKEY_FILE: /run/secrets/proxy.pem ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs @@ -59,7 +60,6 @@ services: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /srv/docker/bridgehead/itcc/root.crt.pem:/conf/root.crt.pem:ro - volumes: blaze-data: diff --git a/itcc/modules/itcc-omics-ingest.yaml b/itcc/modules/itcc-omics-ingest.yaml index 67a57094..cac7a33e 100644 --- a/itcc/modules/itcc-omics-ingest.yaml +++ b/itcc/modules/itcc-omics-ingest.yaml @@ -1,17 +1,17 @@ services: omics-endpoint: - image: ghcr.io/samply/itcc-omics-ingest:hotfix-docker + image: ghcr.io/samply/itcc-omics-ingest:data-lake-s3 environment: - - API_KEY=${GENERATE_API_KEY} - - RUST_LOG=debug - - BEAM_ID=app1.proxy1.broker - - BEAM_SECRET="${FOCUS_BEAM_SECRET_SHORT}" - - BEAM_URL=http://beam-proxy:8081 - - ML_URL=http://mainzelliste:8080 - - BLAZE_URL="http://bridgehead-itcc-blaze:8080/fhir/" - - DATA_LAKE_ID="${DATA_LAKE_ID}" - - PARTNER_ID=itcc-inform - - ML_API_KEY=${GENERATE_API_KEY} + API_KEY: ${GENERATE_API_KEY} + RUST_LOG: debug + BEAM_ID: "omics-endpoint.${PROXY_ID}" + BEAM_SECRET: "${FOCUS_BEAM_SECRET_SHORT}" + BEAM_URL: http://beam-proxy:8081 + ML_URL: http://mainzelliste:8080 + BLAZE_URL: http://bridgehead-itcc-blaze:8080/fhir/ + DATA_LAKE_ID: "${DATA_LAKE_ID}" + PARTNER_ID: itcc-inform + ML_API_KEY: ${GENERATE_API_KEY} volumes: - /var/cache/bridgehead/omics/data:/data/uploads