Dockerfile: upgrade to Debian 13

Remove unused ENV vars.

diff --git a/Dockerfile b/Dockerfile
index cc5e5ad969cebee63feebf5585f27d1e3fe345bf..e1041816bb46c96065b7785be27a1df661d9f426 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,70 +1,64 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Intermediate container for build
-FROM debian:12 AS build
-
-ENV OBS_REPO=knot-resolver-latest
-ENV DISTROTEST_REPO=Debian_12
+FROM debian:13 AS build
 
 RUN apt-get update -qq && \
-       apt-get -qqq -y install \
-               apt-transport-https ca-certificates wget \
-               pipx devscripts && \
-       pipx install apkg
+    apt-get -qqq -y install \
+        apt-transport-https ca-certificates wget \
+        pipx devscripts && \
+    pipx install apkg
 
 RUN wget -O /usr/share/keyrings/cznic-labs-pkg.gpg https://pkg.labs.nic.cz/gpg && \
-       echo "deb [signed-by=/usr/share/keyrings/cznic-labs-pkg.gpg] https://pkg.labs.nic.cz/knot-resolver bookworm main" \
-               > /etc/apt/sources.list.d/cznic-labs-knot-resolver.list && \
-       apt-get update -qq
+    echo "deb [signed-by=/usr/share/keyrings/cznic-labs-pkg.gpg] https://pkg.labs.nic.cz/knot-resolver trixie main" \
+        > /etc/apt/sources.list.d/cznic-labs-knot-resolver.list && \
+    apt-get update -qq
 
 COPY . /source
 
 RUN cd /source && \
-       export PATH="$PATH:/root/.local/bin" && \
-       git submodule update --init --recursive && \
-       git config --global user.name "Docker Build" && \
-       git config --global user.email docker-build@knot-resolver && \
-       \
-       # Replace 'knot-resolver' user and group with 'root'
-       # in meson_options.tx and python/knot_resolver/constants.py.
-       # This is needed for the file/directory permissions validation
-       # and then for the proper functioning of the resolver.
-       sed s/knot-resolver/root/g -i meson_options.txt && \
-       sed 's/USER.*/USER = "root"/g' -i python/knot_resolver/constants.py && \
-       sed 's/GROUP.*/GROUP = "root"/g' -i python/knot_resolver/constants.py && \
-       git commit -a -m TMP && \
-       \
-       /root/.local/bin/apkg build-dep -y && \
-       /root/.local/bin/apkg build
+    export PATH="$PATH:/root/.local/bin" && \
+    git submodule update --init --recursive && \
+    git config --global user.name "Docker Build" && \
+    git config --global user.email docker-build@knot-resolver && \
+    \
+    # Replace 'knot-resolver' user and group with 'root'
+    # in meson_options.tx and python/knot_resolver/constants.py.
+    # This is needed for the file/directory permissions validation
+    # and then for the proper functioning of the resolver.
+    sed s/knot-resolver/root/g -i meson_options.txt && \
+    sed 's/USER.*/USER = "root"/g' -i python/knot_resolver/constants.py && \
+    sed 's/GROUP.*/GROUP = "root"/g' -i python/knot_resolver/constants.py && \
+    git commit -a -m TMP && \
+    \
+    /root/.local/bin/apkg build-dep -y && \
+    /root/.local/bin/apkg build
 
 # Real container
-FROM debian:12-slim AS runtime
-
-ENV OBS_REPO=knot-resolver-latest
-ENV DISTROTEST_REPO=Debian_12
+FROM debian:13-slim AS runtime
 
 RUN apt-get update -qq && \
-       apt-get -qqq -y install apt-transport-https ca-certificates
+    apt-get -qqq -y install apt-transport-https ca-certificates
 
 COPY --from=build \
-       /usr/share/keyrings/cznic-labs-pkg.gpg \
-       /usr/share/keyrings/cznic-labs-pkg.gpg
+    usr/share/keyrings/cznic-labs-pkg.gpg \
+    /usr/share/keyrings/cznic-labs-pkg.gpg
 COPY --from=build \
-       /etc/apt/sources.list.d/cznic-labs-knot-resolver.list \
-       /etc/apt/sources.list.d/cznic-labs-knot-resolver.list
+    /etc/apt/sources.list.d/cznic-labs-knot-resolver.list \
+    /etc/apt/sources.list.d/cznic-labs-knot-resolver.list
 
 RUN apt-get update -qq && \
-       apt-get upgrade -qq
+    apt-get upgrade -qq
 
-COPY --from=build /source/pkg/pkgs/debian-12 /pkg
+COPY --from=build /source/pkg/pkgs/debian-13 /pkg
 
 # install resolver, minimize image and prepare config directory
 RUN apt-get install -y /pkg/*/*.deb && \
-       rm -r /pkg && \
-       apt-get remove -y -qq curl gnupg2 && \
-       apt-get autoremove -y && \
-       apt-get clean && \
-       rm -rf /var/lib/apt/lists/*
+    rm -r /pkg && \
+    apt-get remove -y -qq curl gnupg2 && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 COPY etc/config/config.example.docker.yaml /etc/knot-resolver/config.yaml
 
@@ -72,7 +66,7 @@ LABEL cz.knot-resolver.vendor="CZ.NIC"
 LABEL maintainer="knot-resolver-users@lists.nic.cz"
 
 # Export plain DNS, DoT, DoH and management interface
-EXPOSE 53/UDP 53/TCP 443/TCP 853/TCP 5000/TCP
+EXPOSE 53/udp 53/tcp 443/tcp 853/tcp 5000/tcp
 
 # Prepare shared config
 VOLUME /etc/knot-resolver

diff --git a/NEWS b/NEWS
index 05fc735e7750ed11ca653ed1ebaddcf40ea1858e..d4ce491836751059f698187f01f4522a660f2021 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Knot Resolver 6.4.1 (2026-mm-dd)
+================================
+
+Improvements
+------------
+- docker: upgrade to Debian 13 (!1856)
+
+
 Knot Resolver 6.4.0 (2026-06-17)
 ================================