From 4a92c4bbda9c5a0d0b9b30865dff71d70226cfcf Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 10 Jul 2025 14:05:41 +0200 Subject: [PATCH] switch Docker images to Debian Trixie --- Dockerfile-auth | 6 +++--- Dockerfile-dnsdist | 6 +++--- Dockerfile-recursor | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile-auth b/Dockerfile-auth index 8698b08089..c904121fe5 100644 --- 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 be6641fdab..09edc571fa 100644 --- 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 1369f680f0..c72d90150c 100644 --- 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 / -- 2.47.2