diff options
| author | Florian Dold <florian@dold.me> | 2023-10-17 01:13:21 +0200 |
|---|---|---|
| committer | Florian Dold <florian@dold.me> | 2023-10-17 01:13:21 +0200 |
| commit | d08bbc3c35ac8d9dbd67daf1c49b5c03dcbfae43 (patch) | |
| tree | 468cc08f9c6fd1550284baef6b6253f68da219b4 | |
| parent | 36386d840aac9b9ff8f68103e6833ad9e636745a (diff) | |
| download | deployment-d08bbc3c35ac8d9dbd67daf1c49b5c03dcbfae43.tar.gz deployment-d08bbc3c35ac8d9dbd67daf1c49b5c03dcbfae43.tar.bz2 deployment-d08bbc3c35ac8d9dbd67daf1c49b5c03dcbfae43.zip | |
WIP
| -rw-r--r-- | sandcastle-ng/README.md | 2 | ||||
| -rw-r--r-- | sandcastle-ng/buildconfig/libeufin.tag | 2 | ||||
| -rwxr-xr-x | sandcastle-ng/sandcastle-run | 3 | ||||
| -rwxr-xr-x | sandcastle-ng/scripts/setup-sandcastle.sh | 8 |
4 files changed, 13 insertions, 2 deletions
diff --git a/sandcastle-ng/README.md b/sandcastle-ng/README.md index f5f1cbc..ba15740 100644 --- a/sandcastle-ng/README.md +++ b/sandcastle-ng/README.md @@ -99,6 +99,8 @@ You can always manually run the script inside the container as ``/scripts/setup- # Future Extensions +* The Dockerfile should introduce nightly tags for debian packages it builds. + Currently it just uses the latest defined version, which is confusing. * Do self-tests of the deployment using the wallet CLI * Running the auditor * Running a currency conversion setup with multiple libeufin-bank instances diff --git a/sandcastle-ng/buildconfig/libeufin.tag b/sandcastle-ng/buildconfig/libeufin.tag index 830fca1..cfd3802 100644 --- a/sandcastle-ng/buildconfig/libeufin.tag +++ b/sandcastle-ng/buildconfig/libeufin.tag @@ -1 +1 @@ -v0.9.3-dev.23 +v0.9.3-dev.24 diff --git a/sandcastle-ng/sandcastle-run b/sandcastle-ng/sandcastle-run index 4d6a689..737d3cf 100755 --- a/sandcastle-ng/sandcastle-run +++ b/sandcastle-ng/sandcastle-run @@ -11,6 +11,7 @@ SANDCASTLE_PORT_DONATIONS=16003 SANDCASTLE_PORT_SURVEY=16004 SANDCASTLE_PORT_LANDING=16005 SANDCASTLE_PORT_LIBEUFIN_BANK=16007 +SANDCASTLE_PORT_BANK_SPA=16006 # Container-internal ports, should by synced with scripts/setup-sandcastle.sh PORT_INTERNAL_EXCHANGE=8201 @@ -20,6 +21,7 @@ PORT_INTERNAL_LANDING=8501 PORT_INTERNAL_BLOG=8502 PORT_INTERNAL_DONATIONS=8503 PORT_INTERNAL_SURVEY=8504 +PORT_INTERNAL_BANK_SPA=8505 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) cd $SCRIPT_DIR @@ -41,6 +43,7 @@ exec podman run \ -p=$SANDCASTLE_PORT_BLOG:$PORT_INTERNAL_BLOG \ -p=$SANDCASTLE_PORT_DONATIONS:$PORT_INTERNAL_DONATIONS \ -p=$SANDCASTLE_PORT_SURVEY:$PORT_INTERNAL_SURVEY \ + -p=$SANDCASTLE_PORT_BANK_SPA:$PORT_INTERNAL_BANK_SPA \ --name taler-sandcastle \ --systemd=always \ -v talerdata:/talerdata:Z \ diff --git a/sandcastle-ng/scripts/setup-sandcastle.sh b/sandcastle-ng/scripts/setup-sandcastle.sh index 32d8edd..39e30c4 100755 --- a/sandcastle-ng/scripts/setup-sandcastle.sh +++ b/sandcastle-ng/scripts/setup-sandcastle.sh @@ -44,6 +44,7 @@ PORT_INTERNAL_LANDING=8501 PORT_INTERNAL_BLOG=8502 PORT_INTERNAL_DONATIONS=8503 PORT_INTERNAL_SURVEY=8504 +PORT_INTERNAL_BANK_SPA=8505 # Just make sure the services are stopped systemctl stop taler-exchange.target @@ -125,6 +126,11 @@ https://$MERCHANT_DOMAIN { :$PORT_INTERNAL_MERCHANT { reverse_proxy unix//run/taler/merchant-httpd/merchant-http.sock } + +:$PORT_INTERNAL_BANK_SPA { + root * /usr/share/libeufin-bank/spa + file_server +} EOF cat <<EOF >> /etc/hosts @@ -293,7 +299,7 @@ taler-harness deployment wait-taler-service taler-merchant https://$MERCHANT_DOM # taler-harness deployment provision-merchant-instance https://$MERCHANT_DOMAIN/ taler-harness deployment provision-merchant-instance \ - https://backend.demo.taler.net/ \ + https://$MERCHANT_DOMAIN/ \ --management-token secret-token:sandbox \ --instance-token secret-token:sandbox \ --name Merchant \ |