From 8d31a4a04227cc75f146cb70ac89237d4eeb0074 Mon Sep 17 00:00:00 2001 From: Fabian Schindler <fabian.schindler.strauss@gmail.com> Date: Thu, 29 Oct 2020 18:21:10 +0100 Subject: [PATCH] Mounting registrar configs for each stack --- docker-compose.dem.yml | 8 +++++--- docker-compose.emg.yml | 7 +++++-- docker-compose.vhr18.yml | 7 +++++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docker-compose.dem.yml b/docker-compose.dem.yml index 8381edda..71f3fe9a 100644 --- a/docker-compose.dem.yml +++ b/docker-compose.dem.yml @@ -125,7 +125,7 @@ services: OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD" configs: - source: preprocessor-config - target: /config.yaml + target: /config.yaml deploy: replicas: 1 networks: @@ -166,6 +166,8 @@ services: configs: - source: init-db target: /init-db.sh + - source: registrar-config + target: /config.yaml deploy: replicas: 1 networks: @@ -188,7 +190,6 @@ services: configs: - source: sftp-users-dem target: /etc/sftp/users.conf - ports: - "2222:22" deploy: @@ -218,6 +219,8 @@ configs: file: ./config/dem_index-ops.html preprocessor-config: file: ./config/dem_preprocessor-config.yml + registrar-config: + file: ./config/dem_registrar-config.yml volumes: db-data: redis-data: @@ -233,4 +236,3 @@ secrets: external: true DJANGO_PASSWORD: external: true - \ No newline at end of file diff --git a/docker-compose.emg.yml b/docker-compose.emg.yml index d725f610..660c5229 100644 --- a/docker-compose.emg.yml +++ b/docker-compose.emg.yml @@ -135,7 +135,7 @@ services: OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD" configs: - source: preprocessor-config - target: /config.yaml + target: /config.yaml deploy: replicas: 1 networks: @@ -172,11 +172,12 @@ services: WAIT_SERVICES: "redis:6379 database:5432" OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD" OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD" - REPORTING_DIR: '/mnt/reports/' configs: - source: init-db target: /init-db.sh + - source: registrar-config + target: /config.yaml deploy: replicas: 1 networks: @@ -219,6 +220,8 @@ configs: file: ./config/emg_index-ops.html preprocessor-config: file: ./config/emg_preprocessor-config.yml + registrar-config: + file: ./config/emg_registrar-config.yml volumes: db-data: redis-data: diff --git a/docker-compose.vhr18.yml b/docker-compose.vhr18.yml index 128aea0e..f70165b9 100644 --- a/docker-compose.vhr18.yml +++ b/docker-compose.vhr18.yml @@ -138,7 +138,7 @@ services: OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD" configs: - source: preprocessor-config - target: /config.yaml + target: /config.yaml deploy: replicas: 1 networks: @@ -179,6 +179,8 @@ services: configs: - source: init-db target: /init-db.sh + - source: registrar-config + target: /config.yaml deploy: replicas: 1 networks: @@ -203,7 +205,6 @@ services: target: /etc/sftp/users.conf deploy: replicas: 1 - ports: - "2222:22" ingestor: @@ -225,6 +226,8 @@ configs: file: ./config/vhr18_index-ops.html preprocessor-config: file: ./config/vhr18_preprocessor-config.yml + registrar-config: + file: ./config/vhr18_registrar-config.yml volumes: db-data: redis-data: -- GitLab