commit 2b22fe0ab6cfa1c45b3c70b63c234035c0049655
parent d52bee9fdf87ddcd3c269dcb4df89cd0a240f4bf
Author: Florian Dold <florian@dold.me>
Date: Thu, 20 Nov 2025 20:24:32 +0100
bump versions, make robocop and magnet build work without conflict
Diffstat:
5 files changed, 63 insertions(+), 54 deletions(-)
diff --git a/packaging/ng/buildconfig/robocop.tag b/packaging/ng/buildconfig/robocop.tag
@@ -1 +1 @@
-v1.0.0
+v1.2.1
diff --git a/packaging/ng/buildconfig/taler-magnet-bank.tag b/packaging/ng/buildconfig/taler-magnet-bank.tag
@@ -1 +1 @@
-v0.0.0-dev.3
+v0.0.0-dev.5
diff --git a/packaging/ng/distros/Dockerfile.debian-trixie b/packaging/ng/distros/Dockerfile.debian-trixie
@@ -7,33 +7,34 @@ FROM debian:trixie
ARG DEBIAN_FRONTEND=noninteractive
# Install dependencies
-RUN apt-get update
-RUN apt-get -y upgrade
-RUN apt-get -y dist-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 libgmp-dev texinfo pkgconf zlib1g-dev libopus-dev libextractor-dev libnss3-dev libcurl4-gnutls-dev autopoint
-RUN apt-get -y install libzbar-dev libmariadb-dev-compat libmariadb-dev mandoc libpulse-dev libgstreamer1.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 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
-RUN apt-get -y install dbconfig-no-thanks
-RUN apt-get -y install devscripts equivs
-# For libeufin:
-RUN apt-get -y install python3-click python3-requests python3
-RUN apt-get -y install meson
+RUN \
+ apt-get update \
+ && \
+ apt-get -y full-upgrade \
+ && \
+ apt-get -y install \
+ rustup \
+ build-essential zip jq python3 python3-pip nodejs npm \
+ 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 libgmp-dev texinfo pkgconf \
+ zlib1g-dev libopus-dev libextractor-dev libnss3-dev libcurl4-gnutls-dev autopoint \
+ libzbar-dev libmariadb-dev-compat libmariadb-dev mandoc libpulse-dev libgstreamer1.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 nginx \
+ libgtk-3-dev libgladeui-dev libmagic-dev \
+ dbconfig-no-thanks \
+ devscripts equivs \
+ python3-click python3-requests python3 \
+ meson \
+ openjdk-21-jre-headless \
+ openjdk-21-jdk-headless \
+ default-jre-headless \
+ golang \
+ npm \
+ && \
+ pip install sphinx_rtd_theme --break-system-packages \
+ && \
+ npm install -g pnpm
-RUN apt-get -y install \
- openjdk-21-jre-headless \
- openjdk-21-jdk-headless \
- default-jre-headless \
- ;
-
-RUN pip install sphinx_rtd_theme --break-system-packages
-#RUN npm install -g npm
-RUN npm install -g pnpm
-RUN apt-get -y install golang
-
-RUN apt-get update
-RUN apt-get -y upgrade
-RUN apt-get -y dist-upgrade
diff --git a/packaging/ng/distros/Dockerfile.ubuntu-noble b/packaging/ng/distros/Dockerfile.ubuntu-noble
@@ -7,25 +7,31 @@ FROM ubuntu:noble
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
-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 libgmp-dev texinfo pkgconf zlib1g-dev libopus-dev libextractor-dev libnss3-dev libcurl4-gnutls-dev autopoint
-RUN apt-get -y install libzbar-dev libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-good1.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 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
-RUN apt-get -y install dbconfig-no-thanks
-RUN apt-get -y install devscripts equivs
-# For libeufin:
-RUN apt-get -y install openjdk-17-jdk python3-click python3-requests python3
-RUN apt-get -y install meson
-
-RUN pip install --break-system-packages sphinx_rtd_theme
-RUN npm install -g pnpm
-RUN apt-get -y install golang
-
-RUN apt-get update
-RUN apt-get -y upgrade
-RUN apt-get -y dist-upgrade
+RUN \
+ apt-get update \
+ && \
+ apt-get -y full-upgrade \
+ && \
+ apt-get -y install \
+ rustup \
+ build-essential zip jq python3 python3-pip nodejs npm \
+ 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 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 nginx \
+ libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 \
+ dbconfig-no-thanks \
+ devscripts equivs \
+ openjdk-17-jdk python3-click python3-requests python3 \
+ meson \
+ golang \
+ && \
+ pip install --break-system-packages sphinx_rtd_theme \
+ && \
+ npm install -g pnpm
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -25,11 +25,13 @@ host = "taler.net"
components = [
"gnunet",
"libeufin",
- #"donau",
+ # Temporarily disabled due to versioning issues
+ # "donau",
"challenger",
"taler-exchange",
"taler-harness",
"taler-merchant",
+ "taler-magnet-bank",
"robocop",
"taler-wallet-cli",
# These two packages don't have good debs yet,
