commit 36122802fad37a789a058521487782dca963e179
parent 3f75b15a22c0e1be66e4396e433c76b97676ab82
Author: Florian Dold <florian@dold.me>
Date: Tue, 25 Nov 2025 18:43:47 +0100
naming convention
Diffstat:
4 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/packaging/ng/distros/Dockerfile.debian-trixie b/packaging/ng/distros/Dockerfile.debian-trixie
@@ -1,39 +0,0 @@
-FROM debian:trixie
-# This file is in the public domain.
-#
-# Docker image to build Ubuntu packages of
-# GNUnet, GNU Taler and GNU Anastasis.
-#
-ARG DEBIAN_FRONTEND=noninteractive
-
-# Install dependencies
-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 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 \
- meson \
- default-jdk-headless \
- golang \
- postgresql \
- && \
- pip install sphinx_rtd_theme --break-system-packages \
- && \
- npm install -g pnpm && \
- rustup default stable
-
diff --git a/packaging/ng/distros/debian-trixie.Dockerfile b/packaging/ng/distros/debian-trixie.Dockerfile
@@ -0,0 +1,38 @@
+FROM debian:trixie
+# This file is in the public domain.
+#
+# Docker image to build Ubuntu packages of
+# GNUnet, GNU Taler and GNU Anastasis.
+
+
+# Install dependencies
+RUN \
+ DEBIAN_FRONTEND=noninteractive apt-get update \
+ && \
+ DEBIAN_FRONTEND=noninteractive apt-get -y full-upgrade \
+ && \
+ DEBIAN_FRONTEND=noninteractive apt-get -y install \
+ rustup \
+ build-essential zip jq python3 python3-pip nodejs npm \
+ 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 \
+ 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 \
+ meson \
+ default-jdk-headless \
+ golang \
+ postgresql \
+ && \
+ pip install sphinx_rtd_theme --break-system-packages \
+ && \
+ npm install -g pnpm && \
+ rustup default stable
+
diff --git a/packaging/ng/distros/Dockerfile.ubuntu-noble b/packaging/ng/distros/ubuntu-noble.Dockerfile
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -132,7 +132,7 @@ def build(cfg):
distro = cfg.distro
vendor, codename = distro.split("-", 1)
print("building", distro)
- dockerfile = f"distros/Dockerfile.{distro}"
+ dockerfile = f"distros/{distro}.Dockerfile"
image_tag = f"localhost/taler-packaging-{distro}:latest"
pkgdir = Path(f"packages/{distro}").absolute()
cachedir = Path(f"cache").absolute()
