From 900748b99774356b8d7f0808d40254396efa7317 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Fri, 8 Apr 2022 08:43:42 +0200 Subject: [PATCH 1/4] Added Squid Forward Proxy to Container --- dktk-fed/docker-compose.yml | 58 ++++++++++++++++++++++++++++++++++--- lib/generate.sh | 2 +- lib/prerequisites.sh | 2 +- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dktk-fed/docker-compose.yml b/dktk-fed/docker-compose.yml index a471b33..26d918a 100644 --- a/dktk-fed/docker-compose.yml +++ b/dktk-fed/docker-compose.yml @@ -1,8 +1,9 @@ version: "3.7" services: + ### Does not need proxy settings traefik: - container_name: bridgehead_traefik + container_name: bridgehead-traefik image: traefik:2.4 command: - --api.insecure=true @@ -24,9 +25,19 @@ services: - ../auth/:/auth extra_hosts: - "host.docker.internal:host-gateway" + + ### Does need to know the outside proxy to connect central components + forward_proxy: + container_name: bridgehead-squid + image: ubuntu/squid + environment: + http_proxy: "" + https_proxy: "" + +## Needs internal proxy config landing: - container_name: bridgehead_landingpage + container_name: bridgehead-landingpage image: nginx:stable volumes: - ../landing/:/usr/share/nginx/html @@ -36,9 +47,10 @@ services: - "traefik.http.services.landing.loadbalancer.server.port=80" - "traefik.http.routers.landing.tls=true" +## Needs internal proxy config blaze: image: "samply/blaze:0.16" - container_name: bridgehead_dktk_blaze + container_name: bridgehead-dktk-blaze environment: BASE_URL: "http://blaze:8080" JAVA_TOOL_OPTIONS: "-Xmx4g" @@ -55,7 +67,43 @@ services: - "traefik.http.routers.blaze_dktk.middlewares=dktk_b_strip,test-auth" - "traefik.http.routers.blaze_dktk.tls=true" - # dktk-fed-search-share: + dktk-connector: + image: "samply/share-client:gbn-feature-environmentPreconfiguration" + environment: + POSTGRES_HOST: "dktk-connector-db" + POSTGRES_PASSWORD: "123" + STORE_URL: "http://bridgehead_blaze:8080/fhir" + MDR_URL: "https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr" + http_proxy: "http://squid:3128" + https_proxy: "http://squid:3128" + HTTP_PROXY: "http://squid:3128" + HTTP_PROXY: "http://squid:3128" + DEPLOYMENT_CONTEXT: "dktk-connector" + volumes: + - "dktk-connector-logs:/usr/local/tomcat/logs" + labels: + - "traefik.enable=true" + - "traefik.http.routers.dktk_connector.rule=PathPrefix(`/dktk-connector`)" + - "traefik.http.services.dktk_connector.loadbalancer.server.port=8080" + - "traefik.http.routers.landing.tls=true" + + depends_on: + - "dktk-connector-db" + - "forward_proxy" + restart: "always" + + dktk-connector-db: + image: "postgres:10.17" + environment: + POSTGRES_DB: "samply.connector" + POSTGRES_USER: "samply" + POSTGRES_PASSWORD: "123" + volumes: + - "dktk-connector-db-data:/var/lib/postgresql/data" + restart: "always" + + + # dktk-fed-search-share: # image: "ghcr.io/samply/dktk-fed-search-share:pr-1" # container_name: bridgehead_dktk_share # environment: @@ -89,4 +137,6 @@ services: volumes: blaze-data: + dktk-connector-logs: + dktk-connector-db-data: # dktk-fed-search-share-db-data: \ No newline at end of file diff --git a/lib/generate.sh b/lib/generate.sh index aed7704..2e6859b 100755 --- a/lib/generate.sh +++ b/lib/generate.sh @@ -1,6 +1,6 @@ #!/bin/bash -cat > ../landing/index.html < ./landing/index.html < diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index 05a4c59..65ec9e6 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -4,7 +4,7 @@ ## Check if user is a su echo "Welcome to the starting a bridgehead. We will get your instance up and running in no time" echo "First we will check if all prerequisites are met ..." -prerequisites="git docker docker-compose cat" +prerequisites="git docker docker-compose" for prerequisite in $prerequisites; do $prerequisite --version 2>&1 is_available=$? From 0e82dad091b090ab126a632d91c4788cde1ed56f Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Fri, 8 Apr 2022 14:10:17 +0200 Subject: [PATCH 2/4] Fixed proxy --- auth/dktk | 1 + dktk-fed/docker-compose.yml | 6 +-- landing/index.html | 84 +++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 5 deletions(-) diff --git a/auth/dktk b/auth/dktk index e69de29..c28b857 100644 --- a/auth/dktk +++ b/auth/dktk @@ -0,0 +1 @@ +ps:$apr1$wl54tz29$glQPyZIoNEosI0zQDHXz1. \ No newline at end of file diff --git a/dktk-fed/docker-compose.yml b/dktk-fed/docker-compose.yml index 26d918a..27d7e9d 100644 --- a/dktk-fed/docker-compose.yml +++ b/dktk-fed/docker-compose.yml @@ -72,12 +72,8 @@ services: environment: POSTGRES_HOST: "dktk-connector-db" POSTGRES_PASSWORD: "123" - STORE_URL: "http://bridgehead_blaze:8080/fhir" + STORE_URL: "http://bridgehead-blaze:8080/fhir" MDR_URL: "https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr" - http_proxy: "http://squid:3128" - https_proxy: "http://squid:3128" - HTTP_PROXY: "http://squid:3128" - HTTP_PROXY: "http://squid:3128" DEPLOYMENT_CONTEXT: "dktk-connector" volumes: - "dktk-connector-logs:/usr/local/tomcat/logs" diff --git a/landing/index.html b/landing/index.html index e69de29..fe6ebdf 100644 --- a/landing/index.html +++ b/landing/index.html @@ -0,0 +1,84 @@ + + + + + + + Bridgehead Overview + + + + + + + + + +