From ad4430e48034c855e25c0618d47226cf6fa8e627 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Wed, 28 Feb 2024 10:11:03 +0000 Subject: [PATCH] Create env to control dnpm synthetic data generation --- ccp/modules/dnpm-node-compose.yml | 1 + ccp/modules/dnpm-node-setup.sh | 21 +++++++++++---------- minimal/modules/dnpm-node-compose.yml | 1 + minimal/modules/dnpm-node-setup.sh | 21 +++++++++++---------- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ccp/modules/dnpm-node-compose.yml b/ccp/modules/dnpm-node-compose.yml index 8a39223..ee84d89 100644 --- a/ccp/modules/dnpm-node-compose.yml +++ b/ccp/modules/dnpm-node-compose.yml @@ -6,6 +6,7 @@ services: container_name: bridgehead-dnpm-backend environment: - ZPM_SITE=${ZPM_SITE} + - N_RANDOM_FILES=${DNPM_SYNTH_NUM} volumes: - /etc/bridgehead/dnpm:/bwhc_config:ro - ${DNPM_DATA_DIR}:/bwhc_data diff --git a/ccp/modules/dnpm-node-setup.sh b/ccp/modules/dnpm-node-setup.sh index 88447ef..bf8fd26 100644 --- a/ccp/modules/dnpm-node-setup.sh +++ b/ccp/modules/dnpm-node-setup.sh @@ -14,14 +14,15 @@ if [ -n "${ENABLE_DNPM_NODE}" ]; then log ERROR "Mandatory variable DNPM_DATA_DIR not defined!" exit 1 fi - if grep -q 'traefik.http.routers.landing.rule=PathPrefix(`/landing`)' /srv/docker/bridgehead/minimal/docker-compose.override.yml 2>/dev/null; then - echo "Override of landing page url already in place" - else - echo "Adding override of landing page url" - if [ -f /srv/docker/bridgehead/minimal/docker-compose.override.yml ]; then - echo -e ' landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml - else - echo -e 'version: "3.7"\nservices:\n landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml - fi - fi + DNPM_SYNTH_NUM=${DNPM_SYNTH_NUM:-0} + if grep -q 'traefik.http.routers.landing.rule=PathPrefix(`/landing`)' /srv/docker/bridgehead/minimal/docker-compose.override.yml 2>/dev/null; then + echo "Override of landing page url already in place" + else + echo "Adding override of landing page url" + if [ -f /srv/docker/bridgehead/minimal/docker-compose.override.yml ]; then + echo -e ' landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml + else + echo -e 'version: "3.7"\nservices:\n landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml + fi + fi fi diff --git a/minimal/modules/dnpm-node-compose.yml b/minimal/modules/dnpm-node-compose.yml index 8a39223..ee84d89 100644 --- a/minimal/modules/dnpm-node-compose.yml +++ b/minimal/modules/dnpm-node-compose.yml @@ -6,6 +6,7 @@ services: container_name: bridgehead-dnpm-backend environment: - ZPM_SITE=${ZPM_SITE} + - N_RANDOM_FILES=${DNPM_SYNTH_NUM} volumes: - /etc/bridgehead/dnpm:/bwhc_config:ro - ${DNPM_DATA_DIR}:/bwhc_data diff --git a/minimal/modules/dnpm-node-setup.sh b/minimal/modules/dnpm-node-setup.sh index 88447ef..bf8fd26 100644 --- a/minimal/modules/dnpm-node-setup.sh +++ b/minimal/modules/dnpm-node-setup.sh @@ -14,14 +14,15 @@ if [ -n "${ENABLE_DNPM_NODE}" ]; then log ERROR "Mandatory variable DNPM_DATA_DIR not defined!" exit 1 fi - if grep -q 'traefik.http.routers.landing.rule=PathPrefix(`/landing`)' /srv/docker/bridgehead/minimal/docker-compose.override.yml 2>/dev/null; then - echo "Override of landing page url already in place" - else - echo "Adding override of landing page url" - if [ -f /srv/docker/bridgehead/minimal/docker-compose.override.yml ]; then - echo -e ' landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml - else - echo -e 'version: "3.7"\nservices:\n landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml - fi - fi + DNPM_SYNTH_NUM=${DNPM_SYNTH_NUM:-0} + if grep -q 'traefik.http.routers.landing.rule=PathPrefix(`/landing`)' /srv/docker/bridgehead/minimal/docker-compose.override.yml 2>/dev/null; then + echo "Override of landing page url already in place" + else + echo "Adding override of landing page url" + if [ -f /srv/docker/bridgehead/minimal/docker-compose.override.yml ]; then + echo -e ' landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml + else + echo -e 'version: "3.7"\nservices:\n landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml + fi + fi fi