taler-deployment

commit b62c7c02afbe1a70c7b30aae5cef6268f9c412ae
parent 5482b6aee3d2c4a9426db96c63fd4764b83dc1ee
Author: Florian Dold <florian@dold.me>
Date:   Mon, 23 Jan 2023 14:21:07 +0100

sandcastle: use debian bookworm as base

Diffstat:
M
sandcastle/images/base/Dockerfile
 | 
12
+++++-------

1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/sandcastle/images/base/Dockerfile b/sandcastle/images/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stable
+FROM debian:bookworm
 RUN apt-get update
 
 RUN apt-get install -y autoconf autopoint libtool texinfo \
@@ -7,7 +7,7 @@ RUN apt-get install -y autoconf autopoint libtool texinfo \
   libpq-dev postgresql libcurl4-openssl-dev libsodium-dev git \
   libqrencode-dev zip jq npm openjdk-17-jre nginx procps \
   curl python3-jinja2 wget curl python3-sphinx socat apache2-utils \
-  python3-sphinx-rtd-theme sqlite3 vim emacs
+  python3-sphinx-rtd-theme sqlite3 vim emacs nodejs
 RUN pip3 install requests click poetry uwsgi htmlark
 
 ARG tags_file
@@ -22,6 +22,7 @@ ARG tags_file
 RUN --mount=target=/context if test -n "$tags_file"; then cp \
 /context/${tags_file} /tags.sh; else touch /tags.sh; fi
 
+
 RUN . /tags.sh && git clone git://git.gnunet.org/libmicrohttpd \
   --branch ${TAG_LIBMHD:-master}
 RUN . /tags.sh && git clone git://git.gnunet.org/gnunet \
@@ -82,16 +83,13 @@ RUN ./bootstrap
 RUN ./configure
 RUN make install
 
-# From: https://github.com/nodesource/distributions/blob/master/README.md#debinstall
-RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash - && \
-apt-get install -y nodejs
-RUN npm install -g pnpm
-
 WORKDIR /wallet-core
 RUN ./bootstrap
+
 WORKDIR ./packages/demobank-ui
 RUN ./configure
 RUN make install
+
 # Install CLI to provide integration tests.
 WORKDIR ../taler-wallet-cli
 RUN ./configure