commit 918f67ea7a529dc0613b9f0209010b7a74a59cdf
parent 636937f35768f8803f0f83131d05355ec52b7d2b
Author: Florian Dold <florian@dold.me>
Date: Tue, 28 Oct 2025 15:37:40 +0100
bump component versions, use trixie
Database migration from postgresql 15 to 17 not yet supported.
Diffstat:
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/debian:bookworm AS base-system
+FROM docker.io/library/debian:trixie AS base-system
# FIXMEs:
# - debian packages should be built with a nightly tag
@@ -6,8 +6,6 @@ FROM docker.io/library/debian:bookworm AS base-system
# - the final image contains -dev packages, not really necessary
# - GNUnet build dependencies are excessive, maybe we can just build the required libs?
-
-
RUN DEBIAN_FRONTEND=noninteractive \
apt-get update && \
apt-get -y upgrade && \
@@ -27,7 +25,6 @@ RUN DEBIAN_FRONTEND=noninteractive \
libunistring-dev \
libjansson-dev \
git \
- recutils \
libsqlite3-dev \
libpq-dev \
libmicrohttpd-dev \
@@ -38,8 +35,8 @@ RUN DEBIAN_FRONTEND=noninteractive \
jq \
meson \
npm \
- openjdk-17-jre-headless \
- openjdk-17-jdk-headless \
+ openjdk-21-jre-headless \
+ openjdk-21-jdk-headless \
default-jre-headless \
nano \
procps \
@@ -67,12 +64,14 @@ RUN DEBIAN_FRONTEND=noninteractive \
python3-flask \
python3-flask-babel \
python3-bs4 \
+ python3-requests \
+ python3-click \
pybuild-plugin-pyproject \
pandoc
# FIXME: Try to use debian packages where possible and otherwise really use
# a venv or per-user installation of the package.
-RUN pip3 install --break-system-packages requests click sphinx-book-theme sphinx-markdown-builder sphinxcontrib-jquery
+RUN pip3 install --break-system-packages sphinx-book-theme sphinx-markdown-builder sphinxcontrib-jquery
# GNUnet
FROM base-system AS gnunet
@@ -109,7 +108,7 @@ WORKDIR /
RUN mkdir -p /packages/taldir
RUN mv /build/*.deb /packages/taldir
RUN rm -rf /build
- RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taldir/*.deb
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taldir/*.deb
WORKDIR /
# Mailbox
@@ -128,7 +127,7 @@ WORKDIR /
RUN mkdir -p /packages/taler-mailbox
RUN mv /build/*.deb /packages/taler-mailbox
RUN rm -rf /build
- RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taler-mailbox/*.deb
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y /packages/taler-mailbox/*.deb
WORKDIR /
# Exchange
@@ -337,6 +336,6 @@ RUN systemctl enable setup-sandcastle.service
# Disable potentially problem-causing services
RUN systemctl disable postgresql && \
systemctl disable apache2 || true
-RUN sed -i /etc/postgresql/15/main/postgresql.conf -e 's/^port[ ]*=.*$/port = 5432/'
+RUN sed -i /etc/postgresql/17/main/postgresql.conf -e 's/^port[ ]*=.*$/port = 5432/'
# Not ready yet!
RUN systemctl disable taler-mailbox
diff --git a/buildconfig/exchange.tag b/buildconfig/exchange.tag
@@ -1 +1 @@
-v1.1.1
+v1.1.3-dev.1
diff --git a/buildconfig/libeufin.tag b/buildconfig/libeufin.tag
@@ -1 +1 @@
-v1.0.8
+v1.1.1-dev.1
diff --git a/buildconfig/merchant-demos.tag b/buildconfig/merchant-demos.tag
@@ -1 +1 @@
-v1.0.27-dev.1
+v1.1.0-dev.1
diff --git a/buildconfig/merchant.tag b/buildconfig/merchant.tag
@@ -1 +1 @@
-v1.1.1
+v1.1.3-dev.1
diff --git a/buildconfig/sync.tag b/buildconfig/sync.tag
@@ -1 +1 @@
-v1.0.2
+v1.1.0
