From 03d1a8343937a3fcae5db59eb79c5ecd7fb081bc Mon Sep 17 00:00:00 2001 From: root Date: Tue, 3 May 2022 15:50:38 +0200 Subject: [PATCH] Removed hacky solution for central components --- README.md | 16 ++++++++++++++-- ccp/docker-compose.yml | 12 +++++------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 48a794c..96ed3b1 100644 --- a/README.md +++ b/README.md @@ -142,13 +142,25 @@ If your system passed all checks from ["Requirements" section], you are now read First, clone the repository to the directory "/srv/docker/bridgehead": -u - ``` shell sudo mkdir -p /srv/docker/; sudo git clone https://github.com/samply/bridgehead.git /srv/docker/bridgehead; ``` +The next step is to create a user for the bridgehead service + +``` shell +#!/bin/bash + +mkdir /srv/docker && cd /srv/docker + +adduser --no-create-home --disabled-login --ingroup docker --gecos "" bridgehead +useradd -M -g docker -N -s /sbin/nologin bridgehead + +chown 777 /srv/docker/bridgehead bridgehead +sudo chown bridgehead /srv/docker/bridgehead/ +``` + Next, you need to configure a set of variables, specific for your site with not so high security concerns. You can visit the configuration template at [GitHub](https://github.com/samply/bridgehead-config). You can download the repositories contents and add them to the "bridgehead-config" directory. ``` shell diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 4649e79..3607efa 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -77,15 +77,15 @@ services: container_name: bridgehead-ccp-share environment: APP_BASE_URL: "http://dktk-fed-search-share:8080" - APP_BROKER_BASEURL: "http://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker" + APP_BROKER_BASEURL: "https://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker" APP_BROKER_MAIL: "foo@bar.de" 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" - # http_proxy: "http://bridgehead-squid:3128" - # https_proxy: "http://bridgehead-squid:3128" - # HTTP_PROXY: "http://bridgehead-squid:3128" - # HTTPS_PROXY: "http://bridgehead-squid:3128" + http_proxy: "http://bridgehead-squid:3128" + https_proxy: "http://bridgehead-squid:3128" + HTTP_PROXY: "http://bridgehead-squid:3128" + HTTPS_PROXY: "http://bridgehead-squid:3128" depends_on: - ccp-search-share-db - blaze @@ -93,8 +93,6 @@ services: - "traefik.enable=true" - "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/cpp-connector`)" - "traefik.http.services.dktk-fed-search.loadbalancer.server.port=8080" - extra_hosts: - - "dktk-fed-search.verbis.dkfz.de:10.133.193.8" ccp-search-share-db: image: "postgres:14"