[taler-deployment] branch master updated: docker debian package builder updates

[gnunet]

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

grothoff pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 477b74f  docker debian package builder updates
477b74f is described below

commit 477b74f9b513342ed704ca1082920095b8dea2ac
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Sep 8 20:55:38 2023 +0200

    docker debian package builder updates
---
 packaging/debian-docker/Dockerfile | 6 ++----
 packaging/ubuntu-docker/Dockerfile | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packaging/debian-docker/Dockerfile 
b/packaging/debian-docker/Dockerfile
index 53435f5..60b1b02 100644
--- a/packaging/debian-docker/Dockerfile
+++ b/packaging/debian-docker/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get -y upgrade
 RUN apt-get -y install build-essential zip jq python3 python3-pip nodejs npm
 RUN apt-get -y install autoconf automake gcc make libtool libltdl-dev 
libmicrohttpd-dev libpq-dev libsqlite3-dev libunistring-dev libqrencode-dev 
libgcrypt-dev libsodium-dev libargon2-dev libjansson-dev recutils libgmp-dev 
texinfo pkgconf zlib1g-dev libopus-dev libextractor-dev libnss3-dev 
libcurl4-gnutls-dev autopoint linux-libc-dev python3-sphinx 
python3-sphinxcontrib.httpdomain policykit-1
 RUN apt-get -y install libzbar-dev default-libmysqlclient-dev mandoc 
libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev 
libbluetooth-dev iptables miniupnpc libpng-dev
-RUN apt-get -y install python3-jinja2 doxygen libjose-dev iproute2 sudo
+RUN apt-get -y install python3-jinja2 doxygen libjose-dev iproute2 sudo 
python3-sphinx-rtd-theme
 RUN apt-get -y install wget zile
 RUN apt-get -y install libogg-dev gettext net-tools po-debconf 
debhelper-compat dbconfig-pgsql nginx
 RUN apt-get -y install libgtk-3-dev libgladeui-dev libmagic-dev policykit-1
@@ -24,9 +24,7 @@ RUN apt-get -y install openjdk-17-jdk python3-click 
python3-requests python3
 
 RUN apt-get -y install apt-utils
 
-RUN pip install sphinx_rtd_theme
-RUN npm install -g npm
-RUN /usr/local/bin/npm install -g npm pnpm node
+RUN npm install -g pnpm node
 
 RUN apt-get update
 RUN apt-get -y upgrade
diff --git a/packaging/ubuntu-docker/Dockerfile 
b/packaging/ubuntu-docker/Dockerfile
index 92512b3..881dbf8 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -20,11 +20,9 @@ RUN apt-get -y install libogg-dev gettext net-tools 
po-debconf debhelper-compat
 RUN apt-get -y install libgtk-3-dev libgladeui-dev libmagic-dev policykit-1
 RUN apt-get -y install libnfc-dev
 # For libeufin:
-RUN apt-get -y install openjdk-17-jdk python3-click python3-requests python3
+RUN apt-get -y install openjdk-17-jdk python3-click python3-requests python3 
python3-sphinx-rtd-theme
 
-RUN pip install sphinx_rtd_theme
-RUN npm install -g npm
-RUN /usr/local/bin/npm install -g npm pnpm node
+RUN npm install -g pnpm node
 
 RUN apt-get update
 RUN apt-get -y upgrade

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