[taler-deployment] branch master updated: sandcastle-ng: fix override loading

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new e39ec24  sandcastle-ng: fix override loading
e39ec24 is described below

commit e39ec24e477106e2afa5d559e2efa85bc6e4f04c
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Jan 10 19:36:38 2024 +0100

    sandcastle-ng: fix override loading
---
 sandcastle-ng/sandcastle-run                   | 7 ++++++-
 sandcastle-ng/scripts/demo/setup-sandcastle.sh | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sandcastle-ng/sandcastle-run b/sandcastle-ng/sandcastle-run
index 7b5ccd1..7d31257 100755
--- a/sandcastle-ng/sandcastle-run
+++ b/sandcastle-ng/sandcastle-run
@@ -42,6 +42,12 @@ else
        OVERRIDES=""
 fi
 
+# Beware: It is futile to pass environment variables to the container here,
+# as they will not be available in the systemd unit that provisions the
+# services in the container.
+# That's why we mount the right start-up script and override
+# to a well-known location.
+
 podman run \
   -d \
   -p=$SANDCASTLE_PORT_MERCHANT:$PORT_INTERNAL_MERCHANT \
@@ -54,7 +60,6 @@ podman run \
   -p=$SANDCASTLE_PORT_BANK_SPA:$PORT_INTERNAL_BANK_SPA \
   --name taler-sandcastle \
   --systemd=always \
-  --env "SANDCASTLE_OVERRIDE_NAME=${SANDCASTLE_OVERRIDE_NAME:=none}" \
   -v talerdata:/talerdata:Z \
   $OVERRIDES \
   -v $PWD/scripts:/scripts:Z \
diff --git a/sandcastle-ng/scripts/demo/setup-sandcastle.sh 
b/sandcastle-ng/scripts/demo/setup-sandcastle.sh
index 98df369..1b87f94 100755
--- a/sandcastle-ng/scripts/demo/setup-sandcastle.sh
+++ b/sandcastle-ng/scripts/demo/setup-sandcastle.sh
@@ -21,10 +21,10 @@ echo "Provisioning sandcastle"
 # Might eventually be moved to an external file.
 
 # Source any ovverrides from external file
-if [[ "${SANDCASTLE_OVERRIDE_NAME:-}" != "none" ]]; then
-       cat /overrides
-       source "/overrides" || true
+if [[ -e /overrides ]]; then
+  source /overrides
 fi
+
 CURRENCY=${CURRENCY:="KUDOS"}
 EXCHANGE_IBAN=DE159593
 EXCHANGE_PLAIN_PAYTO=payto://iban/$EXCHANGE_IBAN

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.