taler-deployment

commit a68061e3840edb2b016ecfd458d0744378a0c841
parent a0e3b2f63ec76c364a282654643406d9d92a821c
Author: Antoine A <>
Date:   Fri, 21 Nov 2025 15:14:17 +0100

packaging: improve dockerfile

Diffstat:
M
packaging/ng/distros/Dockerfile.debian-trixie
 | 
13
++++++-------
M
packaging/ng/distros/Dockerfile.ubuntu-noble
 | 
9
++++++---

2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/packaging/ng/distros/Dockerfile.debian-trixie b/packaging/ng/distros/Dockerfile.debian-trixie
@@ -15,7 +15,7 @@ RUN \
   apt-get -y install \
     rustup \
     build-essential zip jq python3 python3-pip nodejs npm \
-    autoconf automake gcc make libtool libltdl-dev libmicrohttpd-dev \
+    autoconf automake libtool libltdl-dev libmicrohttpd-dev \
     libpq-dev libsqlite3-dev libunistring-dev libqrencode-dev libgcrypt-dev \
     libsodium-dev libargon2-dev libjansson-dev libgmp-dev texinfo pkgconf \
     zlib1g-dev libopus-dev libextractor-dev libnss3-dev libcurl4-gnutls-dev autopoint \
@@ -26,15 +26,14 @@ RUN \
     libgtk-3-dev libgladeui-dev libmagic-dev \
     dbconfig-no-thanks \
     devscripts equivs \
-    python3-click python3-requests python3 \
+    python3-click python3-requests \
     meson \
-    openjdk-21-jre-headless \
-    openjdk-21-jdk-headless \
-    default-jre-headless \
+    default-jdk-headless \
     golang \
-    npm \
+    postgresql \
   && \
   pip install sphinx_rtd_theme --break-system-packages \
   && \
-  npm install -g pnpm
+  npm install -g pnpm && \
+  rustup default stable
 
diff --git a/packaging/ng/distros/Dockerfile.ubuntu-noble b/packaging/ng/distros/Dockerfile.ubuntu-noble
@@ -18,7 +18,7 @@ RUN \
   apt-get -y install \
     rustup \
     build-essential zip jq python3 python3-pip nodejs npm \
-    autoconf automake gcc make libtool libltdl-dev libmicrohttpd-dev \
+    autoconf automake libtool libltdl-dev libmicrohttpd-dev \
     libpq-dev libsqlite3-dev libunistring-dev libqrencode-dev libgcrypt-dev \
     libsodium-dev libargon2-dev libjansson-dev libgmp-dev texinfo pkgconf \
     zlib1g-dev libopus-dev libextractor-dev libnss3-dev libcurl4-gnutls-dev \
@@ -31,10 +31,13 @@ RUN \
     libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 \
     dbconfig-no-thanks \
     devscripts equivs \
-    openjdk-17-jdk python3-click python3-requests python3 \
+    python3-click python3-requests \
     meson \
+    default-jdk-headless \
     golang \
+    postgresql \
   && \
   pip install --break-system-packages sphinx_rtd_theme \
   && \
-  npm install -g pnpm
+  npm install -g pnpm && \
+  rustup default stable