Removed hacky solution for central components

This commit is contained in:
root 2022-05-03 15:50:38 +02:00
parent 63b279617b
commit 03d1a83439
2 changed files with 19 additions and 9 deletions

View File

@ -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": First, clone the repository to the directory "/srv/docker/bridgehead":
u
``` shell ``` shell
sudo mkdir -p /srv/docker/; sudo mkdir -p /srv/docker/;
sudo git clone https://github.com/samply/bridgehead.git /srv/docker/bridgehead; 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. 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 ``` shell

View File

@ -77,15 +77,15 @@ services:
container_name: bridgehead-ccp-share container_name: bridgehead-ccp-share
environment: environment:
APP_BASE_URL: "http://dktk-fed-search-share:8080" 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_BROKER_MAIL: "foo@bar.de"
APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir" APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir"
SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/dktk-fed-search-share" SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/dktk-fed-search-share"
JAVA_TOOL_OPTIONS: "-Xmx1g" JAVA_TOOL_OPTIONS: "-Xmx1g"
# http_proxy: "http://bridgehead-squid:3128" http_proxy: "http://bridgehead-squid:3128"
# https_proxy: "http://bridgehead-squid:3128" https_proxy: "http://bridgehead-squid:3128"
# HTTP_PROXY: "http://bridgehead-squid:3128" HTTP_PROXY: "http://bridgehead-squid:3128"
# HTTPS_PROXY: "http://bridgehead-squid:3128" HTTPS_PROXY: "http://bridgehead-squid:3128"
depends_on: depends_on:
- ccp-search-share-db - ccp-search-share-db
- blaze - blaze
@ -93,8 +93,6 @@ services:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/cpp-connector`)" - "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/cpp-connector`)"
- "traefik.http.services.dktk-fed-search.loadbalancer.server.port=8080" - "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: ccp-search-share-db:
image: "postgres:14" image: "postgres:14"