[taler-sandcastle-ng] branch master updated (da8583e -> 57ca123)

[gnunet]

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

devan-carpenter pushed a change to branch master
in repository sandcastle-ng.

    from da8583e  bump versions
     new f539422  run: source external ports from env vars
     new b008572  run: don't follow logs, and exit cleanly
     new 57ca123  systemd: make units use our run script

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 sandcastle-run                                  | 18 +++++------
 systemd/container-taler-sandcastle-demo.service | 43 +++++++------------------
 systemd/container-taler-sandcastle-head.service | 43 ++++++-------------------
 systemd/container-taler-sandcastle-test.service | 43 ++++++-------------------
 4 files changed, 39 insertions(+), 108 deletions(-)

diff --git a/sandcastle-run b/sandcastle-run
index 5fe726d..e47d952 100755
--- a/sandcastle-run
+++ b/sandcastle-run
@@ -4,13 +4,13 @@
 
 set -exou
 
-SANDCASTLE_PORT_MERCHANT=16000
-SANDCASTLE_PORT_EXCHANGE=16001
-SANDCASTLE_PORT_BLOG=16002
-SANDCASTLE_PORT_DONATIONS=16003
-SANDCASTLE_PORT_LANDING=16005
-SANDCASTLE_PORT_LIBEUFIN_BANK=16007
-SANDCASTLE_PORT_BANK_SPA=16009
+SANDCASTLE_PORT_MERCHANT=${SANDCASTLE_PORT_MERCHANT:-16000}
+SANDCASTLE_PORT_EXCHANGE=${SANDCASTLE_PORT_EXCHANGE:-16001}
+SANDCASTLE_PORT_BLOG=${SANDCASTLE_PORT_BLOG:-16002}
+SANDCASTLE_PORT_DONATIONS=${SANDCASTLE_PORT_DONATIONS:-16003}
+SANDCASTLE_PORT_LANDING=${SANDCASTLE_PORT_LANDING:-16005}
+SANDCASTLE_PORT_LIBEUFIN_BANK=${SANDCASTLE_PORT_LIBEUFIN_BANK:-16007}
+SANDCASTLE_PORT_BANK_SPA=${SANDCASTLE_PORT_BANK_SPA:-16009}
 
 # Container-internal ports, should by synced with scripts/setup-sandcastle.sh
 PORT_INTERNAL_EXCHANGE=8201
@@ -46,7 +46,7 @@ fi
 # That's why we mount the right start-up script and override
 # to a well-known location.
 
-podman run \
+exec podman run \
   -d \
   -p=$SANDCASTLE_PORT_MERCHANT:$PORT_INTERNAL_MERCHANT \
   -p=$SANDCASTLE_PORT_EXCHANGE:$PORT_INTERNAL_EXCHANGE \
@@ -64,5 +64,3 @@ podman run \
   --entrypoint /sbin/init \
   "$@" \
   taler-base-all
-
-exec podman exec -it taler-sandcastle journalctl -f
diff --git a/systemd/container-taler-sandcastle-demo.service 
b/systemd/container-taler-sandcastle-demo.service
index 60c95a7..cee23e6 100644
--- a/systemd/container-taler-sandcastle-demo.service
+++ b/systemd/container-taler-sandcastle-demo.service
@@ -1,6 +1,4 @@
 # container-taler-sandcastle-demo.service
-# autogenerated by Podman 4.3.1
-# Tue Feb 13 20:10:51 CET 2024
 
 [Unit]
 Description=Podman container-taler-sandcastle-demo.service
@@ -10,39 +8,20 @@ After=network-online.target
 RequiresMountsFor=%t/containers
 
 [Service]
-Environment=PODMAN_SYSTEMD_UNIT=%n
+Environment=SANDCASTLE_OVERRIDE_NAME=demo.taler.net
+Environment=SANDCASTLE_PORT_MERCHANT=5556
+Environment=SANDCASTLE_PORT_EXCHANGE=5555
+Environment=SANDCASTLE_PORT_BLOG=5559
+Environment=SANDCASTLE_PORT_DONATIONS=5560
+Environment=SANDCASTLE_PORT_SURVEY=5561
+Environment=SANDCASTLE_PORT_LANDING=5562
+Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=15000
+Environment=SANDCASTLE_PORT_BANK_SPA=15002
 Restart=on-failure
 TimeoutStopSec=70
-ExecStartPre=/bin/rm \
-       -f %t/%n.ctr-id
-ExecStart=/usr/bin/podman run \
-       --cidfile=%t/%n.ctr-id \
-       --cgroups=no-conmon \
-       --rm \
-       --sdnotify=conmon \
-       --replace \
-       -d \
-       -p=5556:8301 \
-       -p=5555:8201 \
-       -p=15000:8080 \
-       -p=5562:8501 \
-       -p=5559:8502 \
-       -p=5560:8503 \
-       -p=5561:8504 \
-       -p=15002:8505 \
-       --name taler-sandcastle \
-       --systemd=always \
-       -v talerdata:/talerdata:Z \
-       -v /home/demo/sandcastle-ng/scripts:/scripts:Z \
-       -v /home/demo/sandcastle-ng/scripts/demo:/provision:Z \
-       --entrypoint /sbin/init taler-base-all
+ExecStart=/home/demo/sandcastle-ng/sandcastle-run
 ExecStop=/usr/bin/podman stop \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
-ExecStopPost=/usr/bin/podman rm \
-       -f \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+       taler-sandcastle
 Type=notify
 NotifyAccess=all
 
diff --git a/systemd/container-taler-sandcastle-head.service 
b/systemd/container-taler-sandcastle-head.service
index 43962d5..5ce27d7 100644
--- a/systemd/container-taler-sandcastle-head.service
+++ b/systemd/container-taler-sandcastle-head.service
@@ -1,6 +1,4 @@
 # container-taler-sandcastle-head.service
-# autogenerated by Podman 4.3.1
-# Tue Feb 17 19:32:43 CET 2024
 
 [Unit]
 Description=Podman container-taler-sandcastle-head.service
@@ -10,40 +8,19 @@ After=network-online.target
 RequiresMountsFor=%t/containers
 
 [Service]
-Environment=PODMAN_SYSTEMD_UNIT=%n
+Environment=SANDCASTLE_OVERRIDE_NAME=head.taler.net
+Environment=SANDCASTLE_PORT_EXCHANGE=17001
+Environment=SANDCASTLE_PORT_MERCHANT=17000
+Environment=SANDCASTLE_PORT_BLOG=17002
+Environment=SANDCASTLE_PORT_DONATIONS=17003
+Environment=SANDCASTLE_PORT_LANDING=17005
+Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=17007
+Environment=SANDCASTLE_PORT_BANK_SPA=17009
 Restart=on-failure
 TimeoutStopSec=70
-ExecStartPre=/bin/rm \
-       -f %t/%n.ctr-id
-ExecStart=/usr/bin/podman run \
-       --cidfile=%t/%n.ctr-id \
-       --cgroups=no-conmon \
-       --rm \
-       --sdnotify=conmon \
-       --replace \
-       -d \
-       -p=17000:8301 \
-       -p=17001:8201 \
-       -p=17007:8080 \
-       -p=17005:8501 \
-       -p=17002:8502 \
-       -p=17003:8503 \
-       -p=17004:8504 \
-       -p=17009:8505 \
-       --name taler-sandcastle \
-       --systemd=always \
-       -v talerdata:/talerdata:Z \
-       -v /home/head/sandcastle-ng/overrides/head.taler.net:/overrides:Z \
-       -v /home/head/sandcastle-ng/scripts:/scripts:Z \
-       -v /home/head/sandcastle-ng/scripts/demo:/provision:Z \
-       --entrypoint /sbin/init taler-base-all-head:latest
+ExecStart=/home/head/sandcastle-ng/sandcastle-run
 ExecStop=/usr/bin/podman stop \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
-ExecStopPost=/usr/bin/podman rm \
-       -f \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+       taler-sandcastle
 Type=notify
 NotifyAccess=all
 
diff --git a/systemd/container-taler-sandcastle-test.service 
b/systemd/container-taler-sandcastle-test.service
index 6242de0..36437d8 100644
--- a/systemd/container-taler-sandcastle-test.service
+++ b/systemd/container-taler-sandcastle-test.service
@@ -1,6 +1,4 @@
 # container-taler-sandcastle-test.service
-# autogenerated by Podman 4.3.1
-# Tue Feb 13 19:32:43 CET 2024
 
 [Unit]
 Description=Podman container-taler-sandcastle-test.service
@@ -10,40 +8,19 @@ After=network-online.target
 RequiresMountsFor=%t/containers
 
 [Service]
-Environment=PODMAN_SYSTEMD_UNIT=%n
+Environment=SANDCASTLE_OVERRIDE_NAME=test.taler.net
+Environment=SANDCASTLE_PORT_EXCHANGE=16001
+Environment=SANDCASTLE_PORT_MERCHANT=16000
+Environment=SANDCASTLE_PORT_BLOG=16002
+Environment=SANDCASTLE_PORT_DONATIONS=16003
+Environment=SANDCASTLE_PORT_LANDING=16005
+Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=16007
+Environment=SANDCASTLE_PORT_BANK_SPA=16009
 Restart=on-failure
 TimeoutStopSec=70
-ExecStartPre=/bin/rm \
-       -f %t/%n.ctr-id
-ExecStart=/usr/bin/podman run \
-       --cidfile=%t/%n.ctr-id \
-       --cgroups=no-conmon \
-       --rm \
-       --sdnotify=conmon \
-       --replace \
-       -d \
-       -p=16000:8301 \
-       -p=16001:8201 \
-       -p=16007:8080 \
-       -p=16005:8501 \
-       -p=16002:8502 \
-       -p=16003:8503 \
-       -p=16004:8504 \
-       -p=16009:8505 \
-       --name taler-sandcastle \
-       --systemd=always \
-       -v talerdata:/talerdata:Z \
-       -v /home/taler-test/sandcastle-ng/overrides/test.taler.net:/overrides:Z 
\
-       -v /home/taler-test/sandcastle-ng/scripts:/scripts:Z \
-       -v /home/taler-test/sandcastle-ng/scripts/demo:/provision:Z \
-       --entrypoint /sbin/init taler-base-all
+ExecStart=/home/taler-test/sandcastle-ng/sandcastle-run
 ExecStop=/usr/bin/podman stop \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
-ExecStopPost=/usr/bin/podman rm \
-       -f \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+       taler-sandcastle
 Type=notify
 NotifyAccess=all
 

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