gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-deployment] branch master updated (e277004 -> 20cf52d)


From: gnunet
Subject: [taler-deployment] branch master updated (e277004 -> 20cf52d)
Date: Mon, 04 Dec 2023 15:55:55 +0100

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

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

    from e277004  syntax
     new 1982bed  sandcastle-ng: use full registry name for base
     new d6b2df8  sandcastle-ng: use apt instead of dpkg
     new a6fc396  sandcastle-ng: bump version tags
     new 5dc4d56  sandcastle-ng: make run script print to console
     new f61f808  sandcastle-ng: correct external port for bank SPA
     new 57f7049  sandcastle-ng: make run script show logs
     new 05c509d  sandcastle-ng: add setup for test.taler.net
     new 20cf52d  sandcastle-ng: increase default debt limits

The 8 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-ng/Dockerfile                               | 18 +++++++++---------
 sandcastle-ng/buildconfig/libeufin.tag                 |  2 +-
 sandcastle-ng/buildconfig/merchant.tag                 |  2 +-
 sandcastle-ng/buildconfig/wallet.tag                   |  2 +-
 sandcastle-ng/sandcastle-run                           |  9 ++++++---
 sandcastle-ng/scripts/demo/setup-sandcastle.sh         |  4 ++--
 .../scripts/{demo => test}/setup-sandcastle.sh         |  8 ++++----
 7 files changed, 24 insertions(+), 21 deletions(-)
 copy sandcastle-ng/scripts/{demo => test}/setup-sandcastle.sh (99%)

diff --git a/sandcastle-ng/Dockerfile b/sandcastle-ng/Dockerfile
index f5bec33..7167ce1 100644
--- a/sandcastle-ng/Dockerfile
+++ b/sandcastle-ng/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm AS base-system
+FROM docker.io/library/debian:bookworm AS base-system
 
 # FIXMEs:
 # - debian packages should be built with a nightly tag
@@ -82,7 +82,7 @@ WORKDIR /
 RUN mkdir -p /packages/gnunet
 RUN mv /build/*.deb /packages/gnunet
 RUN rm -rf /build
-RUN dpkg -i /packages/gnunet/*.deb
+RUN apt-get install /packages/gnunet/*.deb
 WORKDIR /
 
 # Exchange
@@ -100,7 +100,7 @@ WORKDIR /
 RUN mkdir -p /packages/exchange
 RUN mv /build/*.deb /packages/exchange
 RUN rm -rf /build
-RUN dpkg -i /packages/exchange/*.deb
+RUN apt-get install /packages/exchange/*.deb
 WORKDIR /
 
 # Merchant
@@ -118,7 +118,7 @@ WORKDIR /
 RUN mkdir -p /packages/merchant
 RUN mv /build/*.deb /packages/merchant
 RUN rm -rf /build
-RUN dpkg -i /packages/merchant/*.deb
+RUN apt-get install /packages/merchant/*.deb
 WORKDIR /
 
 # Libeufin
@@ -137,7 +137,7 @@ WORKDIR /
 RUN mkdir -p /packages/libeufin
 RUN mv /build/*.deb /packages/libeufin
 RUN rm -rf /build
-RUN dpkg -i /packages/libeufin/*.deb
+RUN apt-get install /packages/libeufin/*.deb
 
 # Merchant demos
 FROM base-system as merchant-demos
@@ -154,7 +154,7 @@ WORKDIR /
 RUN mkdir -p /packages/merchant-demos
 RUN mv /build/*.deb /packages/merchant-demos
 RUN rm -rf /build
-RUN dpkg -i /packages/merchant-demos/*.deb
+RUN apt-get install /packages/merchant-demos/*.deb
 
 # wallet-core tools (taler-wallet-cli and taler-harness)
 FROM base-system as wallet
@@ -182,7 +182,7 @@ WORKDIR /
 RUN mkdir -p /packages/wallet
 RUN mv /build/wallet-core/packages/*.deb /packages/wallet
 RUN rm -rf /build
-RUN dpkg -i /packages/wallet/*.deb
+RUN apt-get install /packages/wallet/*.deb
 
 # Sync
 FROM merchant as sync
@@ -198,7 +198,7 @@ WORKDIR /
 RUN mkdir -p /packages/sync
 RUN mv /build/*.deb /packages/sync
 RUN rm -rf /build
-RUN dpkg -i /packages/sync/*.deb
+RUN apt-get install /packages/sync/*.deb
 WORKDIR /
 
 
@@ -230,7 +230,7 @@ COPY --from=merchant /packages/merchant/* /packages/
 COPY --from=wallet /packages/wallet/* /packages/
 COPY --from=libeufin /packages/libeufin/* /packages/
 COPY --from=merchant-demos /packages/merchant-demos/* /packages/
-RUN dpkg -i /packages/*.deb
+RUN apt-get install /packages/*.deb
 COPY systemd/setup-sandcastle.service /etc/systemd/system/
 RUN systemctl enable setup-sandcastle.service
 RUN systemctl disable postgresql
diff --git a/sandcastle-ng/buildconfig/libeufin.tag 
b/sandcastle-ng/buildconfig/libeufin.tag
index 95c601b..3968dc0 100644
--- a/sandcastle-ng/buildconfig/libeufin.tag
+++ b/sandcastle-ng/buildconfig/libeufin.tag
@@ -1 +1 @@
-v0.9.3-dev.27
+v0.9.3-dev.28
diff --git a/sandcastle-ng/buildconfig/merchant.tag 
b/sandcastle-ng/buildconfig/merchant.tag
index 5373159..37cffb3 100644
--- a/sandcastle-ng/buildconfig/merchant.tag
+++ b/sandcastle-ng/buildconfig/merchant.tag
@@ -1 +1 @@
-v0.9.4-dev.2
+v0.9.4-dev.3
diff --git a/sandcastle-ng/buildconfig/wallet.tag 
b/sandcastle-ng/buildconfig/wallet.tag
index be571b2..67c0387 100644
--- a/sandcastle-ng/buildconfig/wallet.tag
+++ b/sandcastle-ng/buildconfig/wallet.tag
@@ -1 +1 @@
-v0.9.3-dev.33
+v0.9.3-dev.34
diff --git a/sandcastle-ng/sandcastle-run b/sandcastle-ng/sandcastle-run
index c79551f..ee98e18 100755
--- a/sandcastle-ng/sandcastle-run
+++ b/sandcastle-ng/sandcastle-run
@@ -2,7 +2,7 @@
 
 # Run the Taler container with all the right mounts and preset parameters
 
-set -eu
+set -exou
 
 SANDCASTLE_PORT_MERCHANT=16000
 SANDCASTLE_PORT_EXCHANGE=16001
@@ -11,7 +11,7 @@ SANDCASTLE_PORT_DONATIONS=16003
 SANDCASTLE_PORT_SURVEY=16004
 SANDCASTLE_PORT_LANDING=16005
 SANDCASTLE_PORT_LIBEUFIN_BANK=16007
-SANDCASTLE_PORT_BANK_SPA=16006
+SANDCASTLE_PORT_BANK_SPA=16009
 
 # Container-internal ports, should by synced with scripts/setup-sandcastle.sh
 PORT_INTERNAL_EXCHANGE=8201
@@ -37,7 +37,8 @@ fi
 
 SETUP_NAME=${SANDCASTLE_SETUP_NAME:-demo}
 
-exec podman run \
+podman run \
+  -d \
   -p=$SANDCASTLE_PORT_MERCHANT:$PORT_INTERNAL_MERCHANT \
   -p=$SANDCASTLE_PORT_EXCHANGE:$PORT_INTERNAL_EXCHANGE \
   -p=$SANDCASTLE_PORT_LIBEUFIN_BANK:$PORT_INTERNAL_LIBEUFIN_BANK \
@@ -54,3 +55,5 @@ exec podman run \
   --entrypoint /sbin/init \
   "$@" \
   taler-base-all
+
+exec podman exec -it taler-sandcastle journalctl -f
diff --git a/sandcastle-ng/scripts/demo/setup-sandcastle.sh 
b/sandcastle-ng/scripts/demo/setup-sandcastle.sh
index 9302d72..d3794d0 100755
--- a/sandcastle-ng/scripts/demo/setup-sandcastle.sh
+++ b/sandcastle-ng/scripts/demo/setup-sandcastle.sh
@@ -179,8 +179,8 @@ sudo -i -u libeufin-bank libeufin-bank dbinit
 cat <<EOF >/etc/libeufin-bank/libeufin-bank.conf
 [libeufin-bank]
 CURRENCY = $CURRENCY
-DEFAULT_CUSTOMER_DEBT_LIMIT = $CURRENCY:200
-DEFAULT_ADMIN_DEBT_LIMIT = $CURRENCY:2000
+DEFAULT_CUSTOMER_DEBT_LIMIT = $CURRENCY:5000
+DEFAULT_ADMIN_DEBT_LIMIT = $CURRENCY:200000000000
 REGISTRATION_BONUS = $CURRENCY:100
 REGISTRATION_BONUS_ENABLED = yes
 SPA_CAPTCHA_URL = https://$BANK_DOMAIN/webui/#/operation/{woid}
diff --git a/sandcastle-ng/scripts/demo/setup-sandcastle.sh 
b/sandcastle-ng/scripts/test/setup-sandcastle.sh
similarity index 99%
copy from sandcastle-ng/scripts/demo/setup-sandcastle.sh
copy to sandcastle-ng/scripts/test/setup-sandcastle.sh
index 9302d72..00f30a9 100755
--- a/sandcastle-ng/scripts/demo/setup-sandcastle.sh
+++ b/sandcastle-ng/scripts/test/setup-sandcastle.sh
@@ -20,7 +20,7 @@ echo "Provisioning sandcastle"
 # General configuration.
 # Might eventually be moved to an external file.
 
-CURRENCY=KUDOS
+CURRENCY=TESTKUDOS
 EXCHANGE_IBAN=DE159593
 EXCHANGE_PLAIN_PAYTO=payto://iban/$EXCHANGE_IBAN
 
EXCHANGE_FULL_PAYTO="payto://iban/$EXCHANGE_IBAN?receiver-name=Sandcastle+Echange+Inc"
@@ -35,7 +35,7 @@ MERCHANT_IBAN_TALER=DE1740597
 MERCHANT_IBAN_TOR=DE2648777
 MERCHANT_IBAN_SURVEY=DE0793060
 
-MYDOMAIN=demo.taler.net
+MYDOMAIN=test.taler.net
 LANDING_DOMAIN=$MYDOMAIN
 BANK_DOMAIN=bank.$MYDOMAIN
 EXCHANGE_DOMAIN=exchange.$MYDOMAIN
@@ -179,8 +179,8 @@ sudo -i -u libeufin-bank libeufin-bank dbinit
 cat <<EOF >/etc/libeufin-bank/libeufin-bank.conf
 [libeufin-bank]
 CURRENCY = $CURRENCY
-DEFAULT_CUSTOMER_DEBT_LIMIT = $CURRENCY:200
-DEFAULT_ADMIN_DEBT_LIMIT = $CURRENCY:2000
+DEFAULT_CUSTOMER_DEBT_LIMIT = $CURRENCY:5000
+DEFAULT_ADMIN_DEBT_LIMIT = $CURRENCY:200000000000
 REGISTRATION_BONUS = $CURRENCY:100
 REGISTRATION_BONUS_ENABLED = yes
 SPA_CAPTCHA_URL = https://$BANK_DOMAIN/webui/#/operation/{woid}

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]