diff --git a/bridgehead b/bridgehead
index c9ba952..64a1463 100755
--- a/bridgehead
+++ b/bridgehead
@@ -18,7 +18,7 @@ cd $BASE
source ./lib/functions.sh
action=$1
-project=$2
+export project=$2
if [[ -z $1 || -z $2 ]]; then
printUsage
@@ -46,7 +46,6 @@ source /etc/bridgehead/site.conf
case "$action" in
start)
checkRequirements
- ./lib/generate-landingpage.sh
exec docker-compose -f ./$project/docker-compose.yml --env-file /etc/bridgehead/$project.env up
;;
stop)
diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 4fdaa92..dc0a3fc 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -39,14 +39,16 @@ services:
landing:
container_name: bridgehead-landingpage
- image: nginx:stable
- volumes:
- - ../landing/:/usr/share/nginx/html:ro
+ image: samply/bridgehead-landingpage:master
labels:
- "traefik.enable=true"
- "traefik.http.routers.landing.rule=PathPrefix(`/`)"
- "traefik.http.services.landing.loadbalancer.server.port=80"
- "traefik.http.routers.landing.tls=true"
+ environment:
+ HOST: ${HOST}
+ project: ${project}
+ site_name: ${site_name}
blaze:
image: "samply/blaze:0.17"
@@ -68,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/gbn/docker-compose.yml b/gbn/docker-compose.yml
index a3bdb1c..36b7263 100644
--- a/gbn/docker-compose.yml
+++ b/gbn/docker-compose.yml
@@ -44,14 +44,16 @@ services:
landing:
container_name: bridgehead-landingpage
- image: nginx:stable
- volumes:
- - ../landing/:/usr/share/nginx/html
+ image: samply/bridgehead-landingpage
labels:
- "traefik.enable=true"
- "traefik.http.routers.landing.rule=PathPrefix(`/`)"
- "traefik.http.services.landing.loadbalancer.server.port=80"
- "traefik.http.routers.landing.tls=true"
+ environment:
+ HOST: ${HOST}
+ project: ${project}
+ site_name: ${site_name}
blaze:
image: "samply/blaze:0.17"
@@ -94,4 +96,4 @@ services:
POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS}
volumes:
- "gbn-connector-db-data:/var/lib/postgresql/data"
- restart: "always"
\ No newline at end of file
+ restart: "always"
diff --git a/lib/generate-landingpage.sh b/lib/generate-landingpage.sh
deleted file mode 100755
index f393057..0000000
--- a/lib/generate-landingpage.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-
-if [ ! -d ./landing ]
-then
- mkdir landing
-fi
-
-CENTRAL_SERVICES="
- CCP-IT |
- Monitoring Service |
-
"
-
-LOCAL_SERVICES="
- Bridgehead |
- Reverse Proxy Traefik |
-
"
-
-if [ "$project" = "ccp" ]
-then
- CENTRAL_SERVICES+="
- CCP-IT |
- Zentrale Patientenliste |
-
-
- CCP-IT |
- Dezentrale Suche |
-
-
- CCP-IT |
- Zentrale Suche |
-
-
- CCP-IT |
- Deployment-Server |
-
-
- CCP-IT |
- Zentraler Kontrollnummernerzeuger |
-
- "
- LOCAL_SERVICES+="
- CCP |
- Blaze |
-
- "
-fi
-
-if [ "$project" = "gbn" ]
-then
- CENTRAL_SERVICES+="
- GBN |
- Sample Locator |
-
-
- GBN |
- Negotiator |
-
- "
- LOCAL_SERVICES+="
- CCP |
- Blaze |
-
- "
-fi
-
-cat > ./landing/index.html <
-
-
-
-
-
- Bridgehead Overview
-
-
-
-
-
-
-
-
-
-
-
Components
-
Central
-
-
-
- Group |
- Service |
-
-
-
- ${CENTRAL_SERVICES}
-
-
-
-
-
-
Local
-
-
-
- Project |
- Services |
-
-
-
- ${LOCAL_SERVICES}
-
-
-
-
-
-
-