commit ea0fa0122fb941ac289e581508a9a5ad946b0dcc
parent 1155da4003c0f298147632a605dd64324231e6de
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Sat, 26 Apr 2025 19:31:04 +0200
add taler directory and mailbox to sandcastle
Diffstat:
7 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
apt-get -y upgrade && \
apt-get --no-install-recommends install -y \
autoconf \
+ golang \
autopoint \
build-essential \
po-debconf \
@@ -154,6 +155,44 @@ RUN rm -rf /build
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/challenger/*.deb
WORKDIR /
+# taler-directory
+FROM base-system AS taler-directory
+
+COPY buildconfig/taler-directory.* /buildconfig/
+WORKDIR /build
+RUN TAG=$(cat /buildconfig/taler-directory.tag) && \
+ git clone git://git.taler.net/taldir \
+ --branch $TAG && \
+ cd taldir && git checkout $(cat /buildconfig/taler-directory.checkout)
+WORKDIR /build/taldir
+RUN ./bootstrap
+RUN dpkg-buildpackage -rfakeroot -b -uc -us
+WORKDIR /
+RUN mkdir -p /packages/taler-directory
+RUN mv /build/*.deb /packages/taler-directory
+RUN rm -rf /build
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taler-directory/*.deb
+WORKDIR /
+
+# taler-directory
+FROM base-system AS taler-mailbox
+
+COPY buildconfig/taler-mailbox.* /buildconfig/
+WORKDIR /build
+RUN TAG=$(cat /buildconfig/taler-mailbox.tag) && \
+ git clone git://git.taler.net/taler-mailbox \
+ --branch $TAG && \
+ cd taler-mailbox && git checkout $(cat /buildconfig/taler-mailbox.checkout)
+WORKDIR /build/taler-mailbox
+RUN ./bootstrap
+RUN dpkg-buildpackage -rfakeroot -b -uc -us
+WORKDIR /
+RUN mkdir -p /packages/taler-mailbox
+RUN mv /build/*.deb /packages/taler-mailbox
+RUN rm -rf /build
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taler-mailbox/*.deb
+WORKDIR /
+
# Libeufin
FROM base-system as libeufin
@@ -265,6 +304,8 @@ COPY --from=exchange /packages/exchange/* /packages/
COPY --from=merchant /packages/merchant/* /packages/
COPY --from=wallet /packages/wallet/* /packages/
COPY --from=libeufin /packages/libeufin/* /packages/
+COPY --from=taler-directory /packages/taler-directory/* /packages/
+COPY --from=taler-mailbox /packages/taler-mailbox/* /packages/
COPY --from=merchant-demos /packages/merchant-demos/* /packages/
COPY --from=challenger /packages/challenger/* /packages/
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y upgrade && \
diff --git a/buildconfig/taler-directory.checkout b/buildconfig/taler-directory.checkout
@@ -0,0 +1 @@
+taler-directory.tag
+\ No newline at end of file
diff --git a/buildconfig/taler-directory.tag b/buildconfig/taler-directory.tag
@@ -0,0 +1 @@
+v1.0.5
diff --git a/buildconfig/taler-mailbox.checkout b/buildconfig/taler-mailbox.checkout
@@ -0,0 +1 @@
+taler-mailbox.tag
+\ No newline at end of file
diff --git a/buildconfig/taler-mailbox.tag b/buildconfig/taler-mailbox.tag
@@ -0,0 +1 @@
+v1.0.0
diff --git a/sandcastle-run b/sandcastle-run
@@ -15,6 +15,8 @@ SANDCASTLE_PORT_LIBEUFIN_BANK=${SANDCASTLE_PORT_LIBEUFIN_BANK:-127.0.0.1:16007}
SANDCASTLE_PORT_BANK_SPA=${SANDCASTLE_PORT_BANK_SPA:-127.0.0.1:16009}
SANDCASTLE_PORT_CHALLENGER=${SANDCASTLE_PORT_CHALLENGER:-127.0.0.1:16010}
SANDCASTLE_PORT_AUDITOR=${SANDCASTLE_PORT_AUDITOR:-127.0.0.1:16011}
+SANDCASTLE_PORT_DIRECTORY=${SANDCASTLE_PORT_DIRECTORY:-127.0.0.1:16012}
+SANDCASTLE_PORT_MAILBOX=${SANDCASTLE_PORT_MAILBOX:-127.0.0.1:16013}
# Container-internal ports, should by synced with scripts/setup-sandcastle.sh
PORT_INTERNAL_EXCHANGE=8201
@@ -27,6 +29,8 @@ PORT_INTERNAL_PROVISION=8504
PORT_INTERNAL_BANK_SPA=8505
PORT_INTERNAL_CHALLENGER=8506
PORT_INTERNAL_AUDITOR=8507
+PORT_INTERNAL_DIRECTORY=8508
+PORT_INTERNAL_MAILBOX=8509
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
cd $SCRIPT_DIR
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -74,6 +74,8 @@ PORT_INTERNAL_PROVISION=8504
PORT_INTERNAL_BANK_SPA=8505
PORT_INTERNAL_CHALLENGER=8506
PORT_INTERNAL_AUDITOR=8507
+PORT_INTERNAL_DIRECTORY=8508
+PORT_INTERNAL_MAILBOX=8509
ENABLE_AUDITOR=0
@@ -90,6 +92,8 @@ systemctl stop taler-demo-blog.service
systemctl stop taler-demo-donations.service
systemctl stop taler-demo-provision.service
systemctl stop libeufin-bank.service
+systemctl stop taler-directory.service
+systemctl stop taler-mailbox.service
# libeufin-nexus is not used
systemctl stop libeufin-nexus-ebics-fetch.service
