From 6e371648fc4d96636df653dd8a7c5d7a571b33ad Mon Sep 17 00:00:00 2001 From: MS Date: Mon, 9 Jan 2023 15:59:04 +0100 Subject: Demo deployment. - Forcing exchange services to WARNING loglevel - Starting libEufin with IPv4 --- docker/demo/README | 14 ++++++++++++++ docker/demo/config/deployment.conf | 1 + docker/demo/images/exchange/startup.sh | 1 + docker/demo/images/libeufin/startup.sh | 14 +++++++------- docker/demo/images/merchant/startup.sh | 9 +++++---- 5 files changed, 28 insertions(+), 11 deletions(-) (limited to 'docker') diff --git a/docker/demo/README b/docker/demo/README index fe0f770..9d0e7ac 100644 --- a/docker/demo/README +++ b/docker/demo/README @@ -58,6 +58,20 @@ modified image. Tag it, to let other images use it to build: Now build all the images with docker-compose, as described in the 'How to run' section. +How to run only one image +========================= + +The following commands run only one image, from those +belonging to the compose file. Note that such image may +easily fail because it likely relies on other images not +being run. + +$ docker-compose build $image-name # if also new changes need to be tested. +$ docker-compose up $image-name + +'bank', 'exchange', 'merchant', 'talerdb' are valid values +for $image-name. + How to run ========== diff --git a/docker/demo/config/deployment.conf b/docker/demo/config/deployment.conf index 5989a92..3f1d848 100644 --- a/docker/demo/config/deployment.conf +++ b/docker/demo/config/deployment.conf @@ -11,6 +11,7 @@ blog-url = http://localhost:5559/ donations-url = http://localhost:5560/ survey-url = http://localhost:5561/ sync-url = http://localhost:5563/ +# This URL is the demobank-ui's: bank-url = http://localhost:15002/ # Pointed to by the bank UI diff --git a/docker/demo/images/exchange/startup.sh b/docker/demo/images/exchange/startup.sh index ebe4ab6..874667c 100644 --- a/docker/demo/images/exchange/startup.sh +++ b/docker/demo/images/exchange/startup.sh @@ -4,6 +4,7 @@ set -o pipefail set -eu export LD_LIBRARY_PATH=/usr/local/lib +export GNUNET_FORCE_LOG=";;;;WARNING" # Values from config file mounted at run time: CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o currency` diff --git a/docker/demo/images/libeufin/startup.sh b/docker/demo/images/libeufin/startup.sh index 3578e1c..5f6193f 100644 --- a/docker/demo/images/libeufin/startup.sh +++ b/docker/demo/images/libeufin/startup.sh @@ -54,7 +54,7 @@ EXCHANGE_IBAN=DE159593 mkdir -p ${MAYBE_VOLUME_MOUNTPOINT} export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret -echo -n "Creating ${CURRENCY} default demobank (CAPTCHA URL: ${CAPTCHA_URL})..." +echo -n "Creating ${CURRENCY} default demobank..." test -a $INIT_MARKER || libeufin-sandbox config \ --currency ${CURRENCY} \ --with-signup-bonus \ @@ -74,11 +74,11 @@ export TALER_ENV_URL_MERCHANT_SURVEY=`taler-config -c /config/deployment.conf -s export TALER_ENV_URL_INTRO=`taler-config -c /config/deployment.conf -s taler-deployment -o landing-url` export TALER_ENV_URL_BANK=`taler-config -c /config/deployment.conf -s taler-deployment -o bank-url` -echo -n "Launching Sandbox..." -libeufin-sandbox serve --no-localhost-only --port $SANDBOX_PORT 2>&1 | \ +echo -n "Launching Sandbox (container-internal URL: ${SANDBOX_BASE_URL})..." +libeufin-sandbox serve --ipv4-only --no-localhost-only --port $SANDBOX_PORT 2>&1 | \ rotatelogs -e /logs/libeufin-sandbox-serve-%Y-%m-%d.log 86400 & echo DONE -is_serving "${LIBEUFIN_SANDBOX_URL}/integration-api/config" Sandbox +is_serving "${SANDBOX_BASE_URL}/demobanks/default/integration-api/config" Sandbox source create_bank_accounts.sh @@ -105,8 +105,8 @@ echo -n "Creating Nexus superuser..." libeufin-nexus superuser $EXCHANGE_NEXUS_USERNAME \ --password $EXCHANGE_NEXUS_PASSWORD echo DONE -echo -n "Launching Nexus..." -libeufin-nexus serve --no-localhost-only --port $NEXUS_PORT 2>&1 | \ +echo -n "Launching Nexus (container-internal URL: $LIBEUFIN_NEXUS_URL)..." +libeufin-nexus serve --ipv4-only --no-localhost-only --port $NEXUS_PORT 2>&1 | \ rotatelogs -e /logs/libeufin-nexus-serve-%Y-%m-%d.log 86400 & echo DONE is_serving $LIBEUFIN_NEXUS_URL Nexus @@ -184,7 +184,7 @@ sed -i "s;__DONATIONS_URL__;${DONATIONS_URL};" /usr/local/share/taler/demobank-u sed -i "s;__SURVEY_URL__;${SURVEY_URL};" /usr/local/share/taler/demobank-ui/demobank-ui-settings.js sed -i "s;__BANK_WEBUI_URL__;${BANK_WEBUI_URL};" /usr/local/share/taler/demobank-ui/demobank-ui-settings.js sed -i "s;__BANK_BACKEND_URL__;${BANK_BACKEND_URL};" /usr/local/share/taler/demobank-ui/demobank-ui-settings.js - +# Serves BANK_WEBUI_URL nginx -c /nginx.conf 2>&1 | rotatelogs -e /logs/bank-ui-%Y-%m-%d.log 86400 & touch $INIT_MARKER diff --git a/docker/demo/images/merchant/startup.sh b/docker/demo/images/merchant/startup.sh index cc964d8..ba48404 100644 --- a/docker/demo/images/merchant/startup.sh +++ b/docker/demo/images/merchant/startup.sh @@ -4,6 +4,7 @@ set -o pipefail set -eu export LD_LIBRARY_PATH=/usr/local/lib +export GNUNET_FORCE_LOG=";;;;WARNING" # Values from config file mounted at run time: CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o currency` @@ -86,10 +87,10 @@ sed -i "s;__BACKEND_URL__;${BACKEND_URL};" /config/taler.conf sed -i "s;__DB_PASSWORD__;${DB_PASSWORD};" /config/taler.conf echo "Init database... " -taler-merchant-dbinit -L DEBUG -c /config/taler.conf +taler-merchant-dbinit -L WARNING -c /config/taler.conf echo DONE echo -n "Launch merchant backend..." -taler-merchant-httpd -a $BACKEND_APIKEY -c /config/taler.conf 2>&1 | \ +taler-merchant-httpd -L WARNING -a $BACKEND_APIKEY -c /config/taler.conf 2>&1 | \ rotatelogs -e /logs/taler-merchant-httpd-%Y-%m-%d.log 86400 & echo DONE sleep 1 @@ -166,11 +167,11 @@ unset LIBEUFIN_SANDBOX_PASSWORD echo DONE echo -n "Init sync database..." -sync-dbinit -L DEBUG -c /config/taler.conf +sync-dbinit -L WARNING -c /config/taler.conf echo DONE echo -n "Launching sync..." -sync-httpd -L DEBUG -c /config/taler.conf 2>&1 | \ +sync-httpd -L WARNING -c /config/taler.conf 2>&1 | \ rotatelogs -e /logs/sync-httpd-%Y-%m-%d.log 86400 & echo DONE -- cgit v1.2.3