switch Docker images to Debian Trixie

diff --git a/Dockerfile-auth b/Dockerfile-auth
index 8698b08089e82d1443d875e38ca6daabdac7ab97..c904121fe5aee1a86fa5113b1a12833e0891cf0a 100644 (file)
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -1,5 +1,5 @@
 # our chosen base image
-FROM debian:11-slim AS builder
+FROM debian:trixie-slim AS builder
 
 ENV NO_LUA_JIT="s390x arm64"
 
@@ -68,14 +68,14 @@ RUN cd /tmp && mkdir /build/tmp/ && mkdir debian && \
     dpkg-deb -I equivs-dummy_1.0_all.deb && cp equivs-dummy_1.0_all.deb /build/tmp/
 
 # Runtime
-FROM debian:11-slim
+FROM debian:trixie-slim
 
 # Reusable layer for base update - Should be cached from builder
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
 
 # Ensure python3 and jinja2 is present (for startup script), and sqlite3 (for db schema), and tini (for signal management),
 #   and vim (for pdnsutil edit-zone) , and supervisor (for special use cases requiring advanced process management)
-RUN apt-get install -y python3 python3-jinja2 sqlite3 tini libcap2-bin vim-tiny supervisor && apt-get clean
+RUN apt-get install -y python3 python3-jinja2 sqlite3 tini libcap2-bin vim-tiny supervisor adduser && apt-get clean
 
 # Output from builder
 COPY --from=builder /build /

diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index be6641fdabd630e60da30261bd80be670d4e9620..09edc571facf5331e5283fd7a7944cd4c404352f 100644 (file)
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -1,5 +1,5 @@
 # our chosen base image
-FROM debian:12-slim AS builder
+FROM debian:trixie-slim AS builder
 
 ENV NO_LUA_JIT="s390x arm64"
 
@@ -104,7 +104,7 @@ RUN cd /tmp && mkdir /build/tmp/ && mkdir debian && \
 
 # Runtime
 
-FROM debian:12-slim
+FROM debian:trixie-slim
 
 # Reusable layer for base update - Should be cached from builder
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
@@ -112,7 +112,7 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
 # - python3 and jinja2 (for startup script)
 # - tini (for signal management)
 # - ca-certificates (for verifying downstream DoH/DoT certificates)
-RUN apt-get install -y python3 python3-jinja2 tini libcap2-bin ca-certificates && apt-get clean
+RUN apt-get install -y python3 python3-jinja2 tini libcap2-bin ca-certificates adduser && apt-get clean
 
 # Output from builder
 COPY --from=builder /build /

diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index 1369f680f0cc37569123074ef8171e60c1051d42..c72d90150c3d7c4e5f62d6df10fe3dfd94b35e8f 100644 (file)
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -5,7 +5,7 @@
 #   dig a www.example.com @0 -p 1053
 
 # Builder
-FROM debian:12-slim AS builder
+FROM debian:trixie-slim AS builder
 
 ENV NO_LUA_JIT="s390x"
 
@@ -90,13 +90,13 @@ RUN cd /tmp && mkdir /build/tmp/ && mkdir debian && \
     dpkg-deb -I equivs-dummy_1.0_all.deb && cp equivs-dummy_1.0_all.deb /build/tmp/
 
 # Runtime
-FROM debian:12-slim
+FROM debian:trixie-slim
 
 # Reusable layer for base update - Should be cached from builder
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
 
 # Ensure python3 and jinja2 is present (for startup script), and tini for signal management
-RUN apt-get install -y python3 python3-jinja2 tini libcap2-bin && apt-get clean
+RUN apt-get install -y python3 python3-jinja2 tini libcap2-bin adduser && apt-get clean
 
 # Executables from builder
 COPY --from=builder /build /