work on packaging

14 files changed, 8 insertions, 18 deletions

diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile
index 20eda26..13e81b9 100644
--- a/packaging/debian-docker/Dockerfile
+++ b/packaging/debian-docker/Dockerfile
@@ -11,17 +11,12 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Install dependencies
 RUN apt-get update
 RUN apt-get -y upgrade
-RUN apt-get -y install build-essential zip jq python3 python3-pip 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 libzbar-dev default-libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev python3-jinja2 doxygen libjose-dev iproute2 sudo python3-sphinx-rtd-theme wget zile libogg-dev gettext net-tools po-debconf debhelper-compat dbconfig-pgsql nginx libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 libnfc-dev python3-click python3-requests apt-utils nodejs npm
-# For libeufin:
-RUN apt-get -y install openjdk-17-jdk-headless default-jre-headless
-# For wallet-core
-RUN npm install -g node pnpm
-
 RUN apt-get update
-RUN apt-get -y upgrade
 RUN apt-get -y dist-upgrade
+RUN apt-get update
+RUN apt-get -y install build-essential zip jq python3 python3-pip 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 libzbar-dev default-libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev python3-jinja2 doxygen libjose-dev iproute2 sudo python3-sphinx-rtd-theme wget zile libogg-dev gettext net-tools po-debconf debhelper-compat dbconfig-pgsql nginx libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 libnfc-dev python3-click python3-requests apt-utils nodejs npm openjdk-17-jdk-headless default-jre-headless
+RUN npm install -g node pnpm
 
-ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
 
 COPY libeufin-build.sh /root/
 RUN chmod +x /root/libeufin-build.sh
diff --git a/packaging/ubuntu-jammy-docker/Dockerfile b/packaging/ubuntu-mantic-docker/Dockerfile
index 1a3e842..7031364 100644
--- a/packaging/ubuntu-jammy-docker/Dockerfile
+++ b/packaging/ubuntu-mantic-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:mantic
 # This file is in the public domain.
 #
 # Docker image to build Ubuntu packages of
@@ -11,16 +11,11 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Install dependencies
 RUN apt-get update
 RUN apt-get -y upgrade
-RUN apt-get -y install build-essential zip jq python3 python3-pip nodejs npm autoconf automake gcc-12 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 libzbar-dev libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev python3-jinja2 doxygen libjose-dev iproute2 sudo wget zile libogg-dev gettext net-tools po-debconf debhelper-compat dbconfig-pgsql nginx libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 libnfc-dev python3-click python3-requests python3-sphinx-rtd-theme
-
-# For libeufin:
-RUN apt-get -y install openjdk-17-jdk
-# For wallet-core:
-RUN npm install -g node pnpm
-
 RUN apt-get update
-RUN apt-get -y upgrade
 RUN apt-get -y dist-upgrade
+RUN apt-get update
+RUN apt-get -y install build-essential zip jq python3 python3-pip nodejs npm autoconf automake gcc-12 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 libzbar-dev libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev python3-jinja2 doxygen libjose-dev iproute2 sudo wget zile libogg-dev gettext net-tools po-debconf debhelper-compat dbconfig-pgsql nginx libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 libnfc-dev python3-click python3-requests python3-sphinx-rtd-theme openjdk-17-jdk
+RUN npm install -g node pnpm
 
 # ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
 COPY gnunet-build.sh /root/
diff --git a/packaging/ubuntu-jammy-docker/README b/packaging/ubuntu-mantic-docker/README
index f4a4824..f4a4824 100644
--- a/packaging/ubuntu-jammy-docker/README
+++ b/packaging/ubuntu-mantic-docker/README
diff --git a/packaging/ubuntu-jammy-docker/anastasis-build.sh b/packaging/ubuntu-mantic-docker/anastasis-build.sh
index 24643e1..24643e1 100644
--- a/packaging/ubuntu-jammy-docker/anastasis-build.sh
+++ b/packaging/ubuntu-mantic-docker/anastasis-build.sh
diff --git a/packaging/ubuntu-jammy-docker/exchange-build.sh b/packaging/ubuntu-mantic-docker/exchange-build.sh
index 57b38e4..57b38e4 100644
--- a/packaging/ubuntu-jammy-docker/exchange-build.sh
+++ b/packaging/ubuntu-mantic-docker/exchange-build.sh
diff --git a/packaging/ubuntu-jammy-docker/gnunet-build.sh b/packaging/ubuntu-mantic-docker/gnunet-build.sh
index 896bdcf..72f07ba 100644
--- a/packaging/ubuntu-jammy-docker/gnunet-build.sh
+++ b/packaging/ubuntu-mantic-docker/gnunet-build.sh
@@ -11,7 +11,7 @@ cd /build/gnunet
 # Fetch source
 rm -rf *
 
-pip3 install sphinx-book-theme
+pip3 install --break-system-packages sphinx-book-theme
 
 for n in gnunet
 do
diff --git a/packaging/ubuntu-jammy-docker/gnunet-gtk-build.sh b/packaging/ubuntu-mantic-docker/gnunet-gtk-build.sh
index 4414c3f..4414c3f 100644
--- a/packaging/ubuntu-jammy-docker/gnunet-gtk-build.sh
+++ b/packaging/ubuntu-mantic-docker/gnunet-gtk-build.sh
diff --git a/packaging/ubuntu-jammy-docker/libeufin-build.sh b/packaging/ubuntu-mantic-docker/libeufin-build.sh
index 7229221..7229221 100644
--- a/packaging/ubuntu-jammy-docker/libeufin-build.sh
+++ b/packaging/ubuntu-mantic-docker/libeufin-build.sh
diff --git a/packaging/ubuntu-jammy-docker/mdb-build.sh b/packaging/ubuntu-mantic-docker/mdb-build.sh
index d097240..d097240 100644
--- a/packaging/ubuntu-jammy-docker/mdb-build.sh
+++ b/packaging/ubuntu-mantic-docker/mdb-build.sh
diff --git a/packaging/ubuntu-jammy-docker/merchant-build.sh b/packaging/ubuntu-mantic-docker/merchant-build.sh
index 5625198..5625198 100644
--- a/packaging/ubuntu-jammy-docker/merchant-build.sh
+++ b/packaging/ubuntu-mantic-docker/merchant-build.sh
diff --git a/packaging/ubuntu-jammy-docker/run.sh b/packaging/ubuntu-mantic-docker/run.sh
index a6df3f0..a6df3f0 100755
--- a/packaging/ubuntu-jammy-docker/run.sh
+++ b/packaging/ubuntu-mantic-docker/run.sh
diff --git a/packaging/ubuntu-jammy-docker/sync-build.sh b/packaging/ubuntu-mantic-docker/sync-build.sh
index e38a0ee..e38a0ee 100644
--- a/packaging/ubuntu-jammy-docker/sync-build.sh
+++ b/packaging/ubuntu-mantic-docker/sync-build.sh
diff --git a/packaging/ubuntu-jammy-docker/taler.list b/packaging/ubuntu-mantic-docker/taler.list
index 29cea42..29cea42 100644
--- a/packaging/ubuntu-jammy-docker/taler.list
+++ b/packaging/ubuntu-mantic-docker/taler.list
diff --git a/packaging/ubuntu-jammy-docker/wallet-build.sh b/packaging/ubuntu-mantic-docker/wallet-build.sh
index 6d807be..6d807be 100644
--- a/packaging/ubuntu-jammy-docker/wallet-build.sh
+++ b/packaging/ubuntu-mantic-docker/wallet-build.sh