[pull] master from CZ-NIC:master

.gitignore

@@ -11,8 +11,10 @@
 .libs/
 .deps/
 .dirstamp
+/scripts/showkey/showkey
 /tmp
 /Knot.creator.user*
+/.qtcreator/Knot.creator.user*
 /Knot.cflags
 /Knot.cxxflags
 /Doxyfile

.gitlab-ci.yml

@@ -209,12 +209,16 @@ test:debian:amd64:
 build:debian:arm64:
   <<: *debian_stable_arm64
   <<: *build_job
+  only:
+    - branches@knot/knot-dns # don't run on forked projects
 
 test:debian:arm64:
   <<: *debian_stable_arm64
   <<: *test_job
   dependencies:
     - build:debian:arm64
+  only:
+    - branches@knot/knot-dns # don't run on forked projects
 
 build:debian:unstable:amd64:
   <<: *debian_unstable
@@ -293,6 +297,7 @@ build:archive:
       - _build/doc/_build/singlehtml
 
 pages:
+  <<: *debian_stable
   stage: documentation
   needs:
     - build:archive
@@ -383,9 +388,9 @@ pkg:debian-12:
   <<: *pkg_test_deb
   image: $CI_REGISTRY/packaging/apkg/test/debian-12
 
-pkg:debian-11:
+pkg:ubuntu-26.04:
   <<: *pkg_test_deb
-  image: $CI_REGISTRY/packaging/apkg/test/debian-11
+  image: $CI_REGISTRY/packaging/apkg/test/ubuntu-26.04
 
 pkg:ubuntu-24.04:
   <<: *pkg_test_deb
@@ -395,10 +400,6 @@ pkg:ubuntu-22.04:
   <<: *pkg_test_deb
   image: $CI_REGISTRY/packaging/apkg/test/ubuntu-22.04
 
-pkg:ubuntu-20.04:
-  <<: *pkg_test_deb
-  image: $CI_REGISTRY/packaging/apkg/test/ubuntu-20.04
-
 pkg:fedora-41:
   <<: *pkg_test
   image: $CI_REGISTRY/packaging/apkg/test/fedora-41

Dockerfile

@@ -2,14 +2,15 @@
 FROM debian:trixie-slim AS builder
 
 # Environment
-ENV BUILD_PKGS \
+ENV BUILD_PKGS=" \
     autoconf \
     automake \
     gcc \
     libbpf-dev \
     libedit-dev \
     libfstrm-dev \
     libgnutls28-dev \
+    libhiredis-dev \
     libidn2-dev \
     liblmdb-dev \
     libmaxminddb-dev \
@@ -24,7 +25,8 @@ ENV BUILD_PKGS \
     libxdp-dev \
     make \
     pkg-config \
-    protobuf-c-compiler
+    protobuf-c-compiler \
+    protobuf-compiler"
 
 # Install dependencies
 RUN apt-get update && \
@@ -43,6 +45,7 @@ RUN autoreconf -if && \
                 --with-module-dnstap=yes \
                 --${FASTPARSER}-fastparser \
                 --enable-quic \
+                --enable-redis \
                 --enable-dnstap \
                 --disable-static \
                 --disable-documentation && \
@@ -58,12 +61,13 @@ FROM debian:trixie-slim
 LABEL maintainer="Knot DNS <knot-dns@labs.nic.cz>"
 
 # Environment
-ENV RUNTIME_PKGS \
+ENV RUNTIME_PKGS=" \
     dbus \
     libbpf1 \
     libedit2 \
     libfstrm0 \
     libgnutls30t64 \
+    libhiredis1.1.0 \
     libidn2-0 \
     liblmdb0 \
     libmaxminddb0 \
@@ -73,7 +77,7 @@ ENV RUNTIME_PKGS \
     libngtcp2-16 \
     libprotobuf-c1 \
     liburcu8t64 \
-    libxdp1
+    libxdp1"
 
 # Install dependencies and create knot user and group
 ARG UID=53
@@ -98,10 +102,10 @@ COPY --from=builder /knot-src/distro/common/cz.nic.knotd.conf /usr/share/dbus-1/
 RUN mkdir -p /run/dbus
 
 # Expose port
-EXPOSE 53/UDP
-EXPOSE 53/TCP
-EXPOSE 853/UDP
-EXPOSE 853/TCP
+EXPOSE 53/udp
+EXPOSE 53/tcp
+EXPOSE 853/udp
+EXPOSE 853/tcp
 
 # Prepare shared directories
 VOLUME /config