feat: WIP! Added Samply Beam and Spot to CCP

This commit is contained in:
Torben Brenner 2022-09-05 16:01:56 +02:00
parent 8c982c939e
commit 33ffecb3a2
2 changed files with 44 additions and 29 deletions

View File

@ -7,8 +7,7 @@ services:
command: command:
- --entrypoints.web.address=:80 - --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443 - --entrypoints.websecure.address=:443
- --providers.docker=true - --providers.docker=true - --api.dashboard=true
- --api.dashboard=true
- --accesslog=true # print access-logs - --accesslog=true # print access-logs
- --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https - --entrypoints.web.http.redirections.entrypoint.scheme=https
@ -67,36 +66,52 @@ services:
- "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,ccp-auth" - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,ccp-auth"
- "traefik.http.routers.blaze_ccp.tls=true" - "traefik.http.routers.blaze_ccp.tls=true"
ccp-search-share: task-store:
image: "samply/dktk-fed-search-share:main" image: "samply/blaze:develop"
container_name: bridgehead-ccp-share
environment: environment:
APP_BASE_URL: "http://dktk-fed-search-share:8080" BASE_URL: "http://localhost:8083"
APP_BROKER_BASEURL: "https://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker" JAVA_TOOL_OPTIONS: "-Xmx1g"
APP_BROKER_MAIL: ${CCP_SEARCHBROKER_USERNAME} LOG_LEVEL: "debug"
APP_BROKER_AUTHTOKEN: ${CCP_SEARCHBROKER_PASSWORD} ports:
APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir" - "8083:8080"
SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/postgres"
JAVA_TOOL_OPTIONS: -Xmx1g -Dhttp.proxyHost=bridgehead-forward-proxy -Dhttp.proxyPort=3128 -Dhttps.proxyHost=bridgehead-forward-proxy -Dhttps.proxyPort=3128 -Dhttp.nonProxyHosts="bridgehead-*"
depends_on:
- ccp-search-share-db
- blaze
labels:
- "traefik.enable=true"
- "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/ccp-connector`)"
- "traefik.http.services.dktk-fed-search.loadbalancer.server.port=8080"
ccp-search-share-db:
image: "postgres:14"
container_name: bridgehead-ccp-share-db
environment:
POSTGRES_USER: "postgres"
POSTGRES_PASSWORD: "postgres"
POSTGRES_DB: "dktk-fed-search-share"
volumes: volumes:
- "ccp-search-share-db-data:/var/lib/postgresql/data" - "task-store-data:/app/data"
data-store:
image: "samply/blaze:develop"
environment:
BASE_URL: "http://localhost:8084"
JAVA_TOOL_OPTIONS: "-Xmx1g"
LOG_LEVEL: "debug"
ports:
- "8084:8080"
volumes:
- "data-store-data:/app/data"
# spot:
# image: "samply/spot"
beam-proxy:
image: "samply/beam-proxy:develop"
environment:
BROKER_URL: ${BROKER_URL}
PROXY_ID: ${PROXY_ID}
APP_0_ID: ${APP_0_ID_SHORT}
APP_0_KEY: ${APP_0_KEY}
APP_1_ID: ${APP_1_ID_SHORT}
APP_1_KEY: ${APP_1_KEY}
PRIVKEY_FILE: /run/secrets/proxy.pem
secrets:
- proxy.pem
volumes: volumes:
blaze-data: blaze-data:
bridgehead-proxy: bridgehead-proxy:
ccp-search-share-db-data: ccp-search-share-db-data:
task-store-data:
data-store-data:
secrets:
proxy.pem:
file: ./pki/${PROXY_ID_SHORT}.priv.pem

View File

@ -13,6 +13,6 @@ source site.conf
log "Starting bridgehead" log "Starting bridgehead"
docker-compose -f ${project}/docker-compose.yml --env-file site-config/${project}.env up -d docker-compose -f <(docker run --rm --volume ${pwd}/${project}/:/tmp/workdir/ samply/templer /tmp/workdir/docker-compose.yml TEST="TEST_0 TEST_1") config
log "The bridgehead should be in online in a few seconds" log "The bridgehead should be in online in a few seconds"