diff --git a/itcc/docker-compose.yml b/itcc/docker-compose.yml index 085c374..07f0322 100644 --- a/itcc/docker-compose.yml +++ b/itcc/docker-compose.yml @@ -47,6 +47,7 @@ services: BROKER_URL: ${BROKER_URL} PROXY_ID: ${PROXY_ID} APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT} + APP_itcc-inform-file_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 @@ -60,32 +61,46 @@ services: - /srv/docker/bridgehead/itcc/root.crt.pem:/conf/root.crt.pem:ro uploader: - image: samply/beam-file + image: samply/beam-file:main-server container_name: uploader + command: ["server"] environment: BROKER_URL: ${BROKER_URL} - BEAM_ID: file.${PROXY_ID} + BEAM_ID: itcc-inform-file.${PROXY_ID} BEAM_SECRET: ${FOCUS_BEAM_SECRET_SHORT} - BEAM_URL: http://uploader:8081 - BIND_ADDR: 0.0.0.0:8085 + BEAM_URL: http://beam-proxy:8081 + BIND_ADDR: "0.0.0.0:8085" API_KEY: ${FOCUS_BEAM_SECRET_SHORT} ROOTCERT_FILE: /conf/root.crt.pem + RUST_LOG: trace ports: - 8085:8085 secrets: - - proxy-file.pem + - proxy.pem depends_on: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /srv/docker/bridgehead/itcc/root.crt.pem:/conf/root.crt.pem:ro - + + scout: + image: samply/scout:main + container_name: bridgehead-scout + configs: + - scout.toml + labels: + - "traefik.enable=true" + - "traefik.http.routers.scout.rule=PathPrefix(`/scout`)" + - "traefik.http.services.scout.loadbalancer.server.port=8080" + - "traefik.http.routers.scout.tls=true" + +configs: + scout.toml: + content: | + fhir_base_url = "http://blaze:8080/fhir" volumes: blaze-data: secrets: proxy.pem: file: /etc/bridgehead/pki/${SITE_ID}.priv.pem - proxy-file.pem: - file: /etc/bridgehead/pki/${SITE_ID}-file.priv.pem - diff --git a/itcc/modules/itcc-omics-ingest.yaml b/itcc/modules/itcc-omics-ingest.yaml index 8108433..f470edc 100644 --- a/itcc/modules/itcc-omics-ingest.yaml +++ b/itcc/modules/itcc-omics-ingest.yaml @@ -1,6 +1,6 @@ services: omics-endpoint: - image: ghcr.io/samply/itcc-omics-ingest:main + image: ghcr.io/samply/itcc-omics-ingest:fix-default environment: - API_KEY=${GENERATE_API_KEY} volumes: