Merge pull request PowerDNS#21 from romeroalx/image-debian-trixie

Generate image for debian trixie

Author: romeroalx

.github/workflows/build-debian-images.yaml

@@ -21,12 +21,20 @@ jobs:
           - id: debian-11-pdns-base
             debian-image-name: python
             debian-image-tag: 3.11-slim-bullseye
+            clang-version: '13'
           - id: debian-12-pdns-base
             debian-image-name: debian
             debian-image-tag: bookworm-slim
+            clang-version: '13'
+          - id: debian-13-pdns-base
+            debian-image-name: python
+            debian-image-tag: 3.11-slim-trixie
+            clang-version: '19'
         exclude:
           - branch-name: rel/auth-4.9.x
             image: {id: debian-11-pdns-base, debian-image-name: python, debian-image-tag: 3.11-slim-bullseye}
+          - branch-name: rel/auth-4.9.x
+            image: {id: debian-13-pdns-base, debian-image-name: python, debian-image-tag: 3.11-slim-trixie}
           - branch-name: rel/auth-4.9.x
             runner: ubuntu-24.04-arm
       fail-fast: false
@@ -65,6 +73,7 @@ jobs:
             DEBIAN_IMAGE_NAME=${{ matrix.image.debian-image-name }}
             DEBIAN_IMAGE_TAG=${{ matrix.image.debian-image-tag }}
             REPO_BRANCH=${{ matrix.branch-name }}
+            CLANG_VERSION=${{ matrix.image.clang-version }}
           outputs: type=image,push-by-digest=true,name-canonical=true
       - name: Export output digest
         env:
@@ -92,9 +101,12 @@ jobs:
         image-id:
           - debian-11-pdns-base
           - debian-12-pdns-base
+          - debian-13-pdns-base
         exclude:
           - branch-name: rel/auth-4.9.x
             image-id: debian-11-pdns-base
+          - branch-name: rel/auth-4.9.x
+            image-id: debian-13-pdns-base
       fail-fast: false
     runs-on: ubuntu-24.04
     if: ${{ github.event_name != 'pull_request' }}
@@ -145,6 +157,7 @@ jobs:
         image-id:
         - debian-11-pdns-base
         - debian-12-pdns-base
+        - debian-13-pdns-base
       fail-fast: false
     steps:
       - name: Get repository name

Dockerfile

@@ -1,5 +1,5 @@
 ARG DEBIAN_IMAGE_NAME=debian
-ARG DEBIAN_IMAGE_TAG=bookworm-slim
+ARG DEBIAN_IMAGE_TAG=trixie-slim
 FROM ${DEBIAN_IMAGE_NAME}:${DEBIAN_IMAGE_TAG}
 
 ARG USER_HOME=/home/runner
@@ -8,7 +8,8 @@ ARG REPO_BRANCH=master
 ARG REPO_URL=https://github.com/PowerDNS/pdns.git
 ARG DOCKER_GID=1000
 
-ENV CLANG_VERSION='13'
+ARG CLANG_VERSION='19'
+ENV CLANG_VERSION=${CLANG_VERSION}
 ENV DECAF_SUPPORT=yes
 
 # Reusable layer for base update
@@ -19,10 +20,14 @@ RUN groupadd -g ${DOCKER_GID} docker
 
 # Install basic SW and debugging tools
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    sudo git curl gnupg software-properties-common wget \
+    sudo git curl gnupg wget \
     ca-certificates apt-utils build-essential vim \
     iproute2 net-tools iputils-* ifupdown cmake acl \
-    time mariadb-client postgresql-client jq python3 python3-requests python3-venv
+    time mariadb-client postgresql-client jq python3 python3-requests \
+    python3-venv $([ "$(. /etc/os-release && echo $VERSION_CODENAME)" = "trixie" ] && echo "systemd-dev")
+
+# Disable ssl verification for for mariadb-client >= 11
+RUN bash -c "echo -e '[client]\ndisable-ssl-verify-server-cert' >> /etc/mysql/my.cnf"
 
 # Required for auth-backend gsqlite3 tests
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
@@ -65,5 +70,5 @@ RUN sudo chmod 777 -R /opt/pdns-auth || true
 
 WORKDIR ${USER_HOME}
 
-# Clean-up folder
+# Clean-up folders
 RUN rm -rf pdns