From c23c1a8d3d62aeb4c1ec9e53d0b55cc9aabcebe7 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 27 Dec 2021 14:41:54 +0100 Subject: [PATCH] Fixed start and stop and c4 deployment --- c4/docker-compose.yml | 35 ++++++++++++++++++----------------- start-bridgehead.sh | 30 +++++++++++++++--------------- stop-bridgehead.sh | 18 +++++++++--------- 3 files changed, 42 insertions(+), 41 deletions(-) mode change 100644 => 100755 start-bridgehead.sh mode change 100644 => 100755 stop-bridgehead.sh diff --git a/c4/docker-compose.yml b/c4/docker-compose.yml index d97e379..0e649bc 100644 --- a/c4/docker-compose.yml +++ b/c4/docker-compose.yml @@ -9,15 +9,15 @@ volumes: store_logs: null secrets: mainzelliste.docker.conf: - file: ./internal-configuration/mainzelliste.conf + file: ../internal-configuration/mainzelliste.conf magicpl.docker.xml: - file: ./internal-configuration/magicpl.xml + file: ../internal-configuration/magicpl.xml dktk_bridgehead_info.docker.xml: - file: ./internal-configuration/bridgehead-common.xml + file: ../internal-configuration/bridgehead-common.xml centralSearchPublicKey: - file: ./internal-configuration/centralSearchPublicKey.der + file: ../internal-configuration/centralSearchPublicKey.der proxy.docker.xml: - file: ./internal-configuration/proxy.xml + file: ../internal-configuration/proxy.xml services: connector: @@ -28,7 +28,7 @@ services: SITEID: ${SITEID} CENTRAL_SEARCH: ${CCP_CENTRALSEARCH_URL} DECENTRAL_SEARCH: ${CCP_DECENTRALSEARCH_URL} - MDR_URL: ${CCP_MDR_URL} + MDR_URL: ${MDR_URL} MONITOR_URL: ${CCP_MONITOR_URL} SHARE_URL: "${PROTOCOL}://${HOST}:${PORT}" ID_MANAGER_URL: ${ID_MANAGER_URL} @@ -36,7 +36,7 @@ services: PATIENTLIST_URL: ${PATIENTLIST_URL} STORE_URL: ${LDM_URL} POSTGRES_HOST: ${CONNECTOR_DB_HOST} - POSTGRES_PORT: 5432 + POSTGRES_PORT: ${CONNECTOR_DB_PORT} POSTGRES_DB: ${CONNECTOR_POSTGRES_DB} POSTGRES_USER: ${CONNECTOR_POSTGRES_USER} POSTGRES_PASS: ${C4_CONNECTOR_POSTGRES_PASSWORD} @@ -52,11 +52,11 @@ services: - "connector_logs:/usr/local/tomcat/logs" depends_on: - connector_db + ports: + - "8082:8080" + - "65496:65395" restart: always - extra_hosts: - - "host.docker.internal:host-gateway" - - "${HOST}:${HOSTIP}" - + connector_db: container_name: bridgehead_connector_db image: postgres:10.17 @@ -68,24 +68,22 @@ services: volumes: - "connector_db_data:/var/lib/postgresql/data" restart: always - extra_hosts: - - "host.docker.internal:host-gateway" - - "${HOST}:${HOSTIP}" ## ID-Management idmanager: container_name: bridgehead_idmanager - image: docker.verbis.dkfz.de/pseudonymisierung/magicpl:release-0.2.0 + image: docker.verbis.dkfz.de/ccp/idmanager:deploy-c4 environment: MAGICPL_MAINZELLISTE_CENTRAL_URL: ${CCP_PATIENTLIST_URL} MAGICPL_CENTRAL_URL: ${CCP_CONTROLLNUMBERGENERATOR_URL} MAGICPL_SITE: ${SITEID} MAGICPL_LOG_LEVEL: info GLOBAL_ID: DKTK - TZ: Europe/Berlin volumes: - "idmanager_logs:/usr/local/tomcat/logs" + ports: + - "8084:8080" secrets: - magicpl.docker.xml - dktk_bridgehead_info.docker.xml @@ -98,7 +96,7 @@ services: MDR_URL: ${CCP_MDR_URL} MDR_NAMESPACE: adt,dktk,marker MDR_VALIDATION: "false" - POSTGRES_HOST: store_db + POSTGRES_HOST: bridgehead_store_db POSTGRES_PORT: 5432 POSTGRES_DB: samplystore POSTGRES_USER: samplystore @@ -108,6 +106,9 @@ services: - "store_logs:/usr/local/tomcat/logs" depends_on: - store_db + ports: + - "8083:8080" + - "65495:65395" restart: always store_db: diff --git a/start-bridgehead.sh b/start-bridgehead.sh old mode 100644 new mode 100755 index 124be38..de34193 --- a/start-bridgehead.sh +++ b/start-bridgehead.sh @@ -1,15 +1,15 @@ -#!/bin/bash -### Note: Currently not complete, needs some features before useable for production - -./prerequisites.sh -source site.conf - -echo "Starting bridgehead" - -cd ${project} - -docker-compose --env-file ../site-config/${project}.env up - -cd .. - -echo "The bridgehead should be in online in a few seconds" +#!/bin/bash +### Note: Currently not complete, needs some features before useable for production + +./prerequisites.sh +source site.conf + +echo "Starting bridgehead" + +cd ${project} + +docker-compose --env-file ../site-config/${project}.env up -d + +cd .. + +echo "The bridgehead should be in online in a few seconds" diff --git a/stop-bridgehead.sh b/stop-bridgehead.sh old mode 100644 new mode 100755 index 6d39480..8ab4eff --- a/stop-bridgehead.sh +++ b/stop-bridgehead.sh @@ -1,9 +1,9 @@ -echo "Stoping bridgehead" - -source site.conf - -cd ${project} - -docker-compose --env-file ../site-config/{project}.env down - -cd .. +echo "Stoping bridgehead" + +source site.conf + +cd ${project} + +docker-compose --env-file ../site-config/${project}.env down + +cd ..