From 8da8a7933a00cc77759213ed7aab334130b5610a Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Wed, 11 May 2022 09:05:23 +0200 Subject: [PATCH] Correct link to docker images --- ccp/docker-compose.yml | 5 +++-- lib/prerequisites.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index dfe210d..dc0a3fc 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -39,7 +39,7 @@ services: landing: container_name: bridgehead-landingpage - image: samply/bridgehead-landingpage + image: samply/bridgehead-landingpage:master labels: - "traefik.enable=true" - "traefik.http.routers.landing.rule=PathPrefix(`/`)" @@ -70,12 +70,13 @@ services: - "traefik.http.routers.blaze_ccp.tls=true" ccp-search-share: - image: "samply/dktk-fed-search-share" + image: "samply/dktk-fed-search-share:main" container_name: bridgehead-ccp-share environment: APP_BASE_URL: "http://dktk-fed-search-share:8080" APP_BROKER_BASEURL: "https://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker" APP_BROKER_MAIL: ${CCP_SEARCHBROKER_USERNAME} + APP_BROKER_AUTHTOKEN: ${CCP_SEARCHBROKER_PASSWORD} APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir" SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/dktk-fed-search-share" JAVA_TOOL_OPTIONS: "-Xmx1g" diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index fc5ab54..130036e 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -65,7 +65,7 @@ if [ ! -d "certs" ]; then mkdir -p certs fi -if [ -e "/etc/bridgehead/traefik.crt" ]; then +if [ ! -e "certs/traefik.crt" ]; then openssl req -x509 -newkey rsa:4096 -nodes -keyout certs/traefik.key -out certs/traefik.crt -days 365 fi