commit 3e0148cc94707f889c2395abb1264928dcdf7865 parent d6232f3e58386ef1fd2be73a84346b90c770dcb9 Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Thu, 25 Dec 2025 10:27:51 +0900 add mailbox and directory back to build Diffstat:
| M | Dockerfile | | | 75 | +++++++++++++++++++++++++++++++++++++-------------------------------------- |
| M | buildconfig/taler-directory.tag | | | 2 | +- |
| M | buildconfig/taler-mailbox.tag | | | 2 | +- |
| M | scripts/demo/setup-sandcastle.sh | | | 14 | ++++++++++++++ |
4 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/Dockerfile b/Dockerfile @@ -92,43 +92,42 @@ RUN rm -rf /build RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/gnunet/*.deb WORKDIR / -## 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.gnunet.org/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/taldir -#RUN mv /build/*.deb /packages/taldir -#RUN rm -rf /build -#RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taldir/*.deb -#WORKDIR / +# Directory +FROM base-system AS taler-directory -## Mailbox -#FROM base-system AS taler-mailbox -# -#COPY buildconfig/taler-mailbox.* /buildconfig/ -#WORKDIR /build -#RUN TAG=$(cat /buildconfig/taler-mailbox.tag) && \ -# git clone git://git.gnunet.org/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 / +COPY buildconfig/taler-directory.* /buildconfig/ +WORKDIR /build +RUN TAG=$(cat /buildconfig/taler-directory.tag) && \ + git clone git://git.gnunet.org/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/taldir +RUN mv /build/*.deb /packages/taldir +RUN rm -rf /build +RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taldir/*.deb +WORKDIR / + +# Mailbox +FROM base-system AS taler-mailbox + +COPY buildconfig/taler-mailbox.* /buildconfig/ +WORKDIR /build +RUN TAG=$(cat /buildconfig/taler-mailbox.tag) && \ + git clone git://git.gnunet.org/taler-mailbox \ + --branch $TAG && \ + cd taler-mailbox && git checkout $(cat /buildconfig/taler-mailbox.checkout) +WORKDIR /build/taler-mailbox +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 / # Exchange FROM gnunet as exchange @@ -340,8 +339,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y upgrade && apt-g RUN mkdir -p /packages COPY --from=gnunet /packages/gnunet/* /packages/ -#COPY --from=taler-directory /packages/taldir/* /packages/ -#COPY --from=taler-mailbox /packages/taler-mailbox/* /packages/ +COPY --from=taler-directory /packages/taldir/* /packages/ +COPY --from=taler-mailbox /packages/taler-mailbox/* /packages/ COPY --from=exchange /packages/exchange/* /packages/ COPY --from=merchant /packages/merchant/* /packages/ COPY --from=wallet /packages/wallet/* /packages/ diff --git a/buildconfig/taler-directory.tag b/buildconfig/taler-directory.tag @@ -1 +1 @@ -v1.0.5 +debian-1.1.0 diff --git a/buildconfig/taler-mailbox.tag b/buildconfig/taler-mailbox.tag @@ -1 +1 @@ -v1.0.0 +debian-1.1.0 diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh @@ -1105,6 +1105,20 @@ DONAU_BASE_URL=$PROTO://$DONAU_DOMAIN$PORT_SUFFIX/ taler-harness deployment wait-taler-service donau ${DONAU_BASE_URL}config +# Mailbox and Directory +#sudo -i -u postgres psql postgres -c "CREATE ROLE taldir WITH login;" || true +#sudo -i -u postgres psql postgres -c "ALTER ROLE taldir password 'secret';" +#sudo -u postgres createdb taldir --owner=taldir || true +#mkdir -p /etc/taler-directory +#cp /usr/share/taldir.conf.example /etc/taler-directory/taler-directory.conf +#systemctl enable --now taler-directory.service +# +#sudo -i -u postgres psql postgres -c "CREATE ROLE talermailbox WITH login;" || true +#sudo -i -u postgres psql postgres -c "ALTER ROLE talermailbox password 'secret';" +#sudo -u postgres createdb taler-mailbox --owner=talermailbox || true +#mkdir -p /etc/taler-mailbox +#cp /usr/share/taler-mailbox.conf.example /etc/taler-mailbox/taler-mailbox.conf +#systemctl enable --now taler-mailbox.service GNUNET_TOK=$(taler-harness merchant token ${MERCHANT_BASEURL}instances/gnunet/ gnunet --password $(get_credential_pw merchant/gnunet)) taler-harness deployment provision-merchant-donau \