From d23665d585da8faad5077d9aaa64aa5a971b1352 Mon Sep 17 00:00:00 2001
From: tecnovert <tecnovert@tecnovert.net>
Date: Tue, 9 Jun 2026 12:03:02 +0200
Subject: [PATCH] build: update docker base images to debian:trixie

---
 Dockerfile                                  | 15 ++++++++++-----
 doc/release-notes.md                        |  7 +++++++
 docker/production/bitcoin/Dockerfile        |  2 +-
 docker/production/bitcoincash/Dockerfile    |  2 +-
 docker/production/dash/Dockerfile           |  2 +-
 docker/production/decred_daemon/Dockerfile  |  2 +-
 docker/production/dogecoin/Dockerfile       |  2 +-
 docker/production/firo/Dockerfile           |  2 +-
 docker/production/litecoin/Dockerfile       |  2 +-
 docker/production/monero_daemon/Dockerfile  |  2 +-
 docker/production/particl/Dockerfile        |  2 +-
 docker/production/pivx/Dockerfile           |  2 +-
 docker/production/swapclient/Dockerfile     | 11 ++++++++---
 docker/production/wownero_daemon/Dockerfile |  2 +-
 14 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96253bd..76da4d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,25 @@
-FROM ubuntu:22.04
+FROM debian:trixie-slim
 
 ENV LANG=C.UTF-8 \
     DEBIAN_FRONTEND=noninteractive \
-    DATADIRS="/coindata"
+    DATADIRS="/coindata" \
+    VIRTUAL_ENV=/opt/venv
 
 RUN apt-get update; \
     apt-get install -y --no-install-recommends \
-        python3-pip libpython3-dev gnupg pkg-config gcc libc-dev gosu tzdata cmake ninja-build;
+        python3-pip libpython3-dev python3-venv gnupg pkg-config gcc libc-dev gosu tzdata cmake ninja-build;
+
+# Create python venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 # Install requirements first so as to skip in subsequent rebuilds
 COPY ./requirements.txt requirements.txt
-RUN pip3 install -r requirements.txt --require-hashes
+RUN pip install -r requirements.txt --require-hashes
 
 COPY . basicswap-master
 RUN cd basicswap-master; \
-    pip3 install .;
+    pip install .;
 
 RUN useradd -ms /bin/bash swap_user && \
     mkdir /coindata && chown swap_user -R /coindata
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 2b22a69..8e82176 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,3 +1,10 @@
+
+0.16.5
+==============
+
+- Updated docker base images to Debian Trixie.
+
+
 0.16.3
 ==============
 
diff --git a/docker/production/bitcoin/Dockerfile b/docker/production/bitcoin/Dockerfile
index 52b02f7..fdabba7 100644
--- a/docker/production/bitcoin/Dockerfile
+++ b/docker/production/bitcoin/Dockerfile
@@ -5,7 +5,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=bitcoin --withoutcoins=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV BITCOIN_DATA /data
diff --git a/docker/production/bitcoincash/Dockerfile b/docker/production/bitcoincash/Dockerfile
index 8004e36..c56fd9a 100644
--- a/docker/production/bitcoincash/Dockerfile
+++ b/docker/production/bitcoincash/Dockerfile
@@ -5,7 +5,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=bitcoincash --withoutcoins=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV BITCOINCASH_DATA /data
diff --git a/docker/production/dash/Dockerfile b/docker/production/dash/Dockerfile
index de8713c..dda2b63 100644
--- a/docker/production/dash/Dockerfile
+++ b/docker/production/dash/Dockerfile
@@ -5,7 +5,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=dash --withoutcoins=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV DASH_DATA /data
diff --git a/docker/production/decred_daemon/Dockerfile b/docker/production/decred_daemon/Dockerfile
index f15237a..aecc75e 100644
--- a/docker/production/decred_daemon/Dockerfile
+++ b/docker/production/decred_daemon/Dockerfile
@@ -3,7 +3,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=decred --withoutcoins=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV DCR_DATA /data
diff --git a/docker/production/dogecoin/Dockerfile b/docker/production/dogecoin/Dockerfile
index 4630e69..1ed2dde 100644
--- a/docker/production/dogecoin/Dockerfile
+++ b/docker/production/dogecoin/Dockerfile
@@ -3,7 +3,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=dogecoin --withoutcoin=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV DOGECOIN_DATA /data
diff --git a/docker/production/firo/Dockerfile b/docker/production/firo/Dockerfile
index b245a89..fbc651c 100644
--- a/docker/production/firo/Dockerfile
+++ b/docker/production/firo/Dockerfile
@@ -3,7 +3,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=firo --withoutcoins=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV FIRO_DATA /data
diff --git a/docker/production/litecoin/Dockerfile b/docker/production/litecoin/Dockerfile
index fc0cba2..598e9e3 100644
--- a/docker/production/litecoin/Dockerfile
+++ b/docker/production/litecoin/Dockerfile
@@ -3,7 +3,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=litecoin --withoutcoin=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV LITECOIN_DATA /data
diff --git a/docker/production/monero_daemon/Dockerfile b/docker/production/monero_daemon/Dockerfile
index c470e8e..dc860a5 100644
--- a/docker/production/monero_daemon/Dockerfile
+++ b/docker/production/monero_daemon/Dockerfile
@@ -2,7 +2,7 @@ FROM i_swapclient as install_stage
 
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=monero --withoutcoins=particl
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 COPY --from=install_stage /coin_bin .
 
diff --git a/docker/production/particl/Dockerfile b/docker/production/particl/Dockerfile
index 63441f8..098cee5 100644
--- a/docker/production/particl/Dockerfile
+++ b/docker/production/particl/Dockerfile
@@ -3,7 +3,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV PARTICL_DATA /data
diff --git a/docker/production/pivx/Dockerfile b/docker/production/pivx/Dockerfile
index 6e16d79..b75656c 100644
--- a/docker/production/pivx/Dockerfile
+++ b/docker/production/pivx/Dockerfile
@@ -3,7 +3,7 @@ FROM i_swapclient as install_stage
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=pivx --withoutcoins=particl && \
     find /coin_bin -name *.tar.gz -delete
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 COPY --from=install_stage /coin_bin .
 
 ENV PIVX_DATA /data
diff --git a/docker/production/swapclient/Dockerfile b/docker/production/swapclient/Dockerfile
index 0a069ef..075fece 100644
--- a/docker/production/swapclient/Dockerfile
+++ b/docker/production/swapclient/Dockerfile
@@ -1,12 +1,17 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 ENV LANG=C.UTF-8 \
     DEBIAN_FRONTEND=noninteractive \
-    DATADIR=/data
+    DATADIR=/data \
+    VIRTUAL_ENV=/opt/venv
 
 RUN apt-get update; \
     apt-get install -y --no-install-recommends \
-        python3-pip libpython3-dev gnupg pkg-config gcc libc-dev gosu tzdata wget unzip cmake ninja-build;
+        python3-pip libpython3-dev python3-venv gnupg pkg-config gcc libc-dev gosu tzdata wget unzip cmake ninja-build;
+
+# Create python venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 ARG BASICSWAP_URL=https://github.com/basicswap/basicswap/archive/master.zip
 ARG BASICSWAP_DIR=basicswap-master
diff --git a/docker/production/wownero_daemon/Dockerfile b/docker/production/wownero_daemon/Dockerfile
index c857e78..3210676 100644
--- a/docker/production/wownero_daemon/Dockerfile
+++ b/docker/production/wownero_daemon/Dockerfile
@@ -2,7 +2,7 @@ FROM i_swapclient as install_stage
 
 RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=wownero --withoutcoins=particl
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 COPY --from=install_stage /coin_bin .