From d2ad01fd37d72e121fdcf927a30e055a4ccc035e Mon Sep 17 00:00:00 2001 From: Pim van den Berg Date: Sun, 4 Feb 2024 19:10:33 +0100 Subject: [PATCH] feat: drop Debian 11 support --- .drone.yml | 1 - README.md | 1 - build/rebuild.sh | 4 ---- debian/11/Dockerfile | 22 ---------------------- debian/11/build.sh | 9 --------- debian/11/start.sh | 30 ------------------------------ 6 files changed, 67 deletions(-) delete mode 100644 debian/11/Dockerfile delete mode 100755 debian/11/build.sh delete mode 100755 debian/11/start.sh diff --git a/.drone.yml b/.drone.yml index d322cd2..9986fb6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,6 @@ steps: commands: - sleep 5 # give docker enough time to start - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - ./debian/11/build.sh - ./debian/12/build.sh when: branch: diff --git a/README.md b/README.md index 5128e23..53f6025 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ # Supported tags and respective `Dockerfile` links - [`4.6-bookworm`, `latest`](https://github.com/pommi/docker-powerdns/blob/master/debian/12/Dockerfile) -- [`4.4-bullseye`](https://github.com/pommi/docker-powerdns/blob/master/debian/11/Dockerfile) # Usage diff --git a/build/rebuild.sh b/build/rebuild.sh index eb95b94..c05a772 100755 --- a/build/rebuild.sh +++ b/build/rebuild.sh @@ -11,10 +11,6 @@ updates_available () { fi } -if updates_available pommib/powerdns:4.4-bullseye; then - ./debian/11/build.sh -fi - if updates_available pommib/powerdns:4.6-bookworm; then ./debian/12/build.sh fi diff --git a/debian/11/Dockerfile b/debian/11/Dockerfile deleted file mode 100644 index e8e3b95..0000000 --- a/debian/11/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM debian:bullseye-slim - -RUN set -eux && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - pdns-server \ - pdns-backend-bind \ - sqlite3 \ - bind9-dnsutils \ - inotify-tools \ - && \ - rm -rf /var/lib/apt/lists/* - -ADD start.sh / - -EXPOSE 53/tcp 53/udp -VOLUME ["/var/lib/powerdns"] - -CMD /start.sh - -HEALTHCHECK CMD dig +timeout=1 @127.0.0.1 || exit 1 diff --git a/debian/11/build.sh b/debian/11/build.sh deleted file mode 100755 index 7c1f192..0000000 --- a/debian/11/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -ex - -IMAGE=pommib/powerdns:4.4-bullseye -docker pull $IMAGE -docker pull debian:bullseye-slim -docker build --no-cache -t $IMAGE ./debian/11/ -docker push $IMAGE diff --git a/debian/11/start.sh b/debian/11/start.sh deleted file mode 100755 index e650da1..0000000 --- a/debian/11/start.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# create sqlite database for DNSSEC -if test ! -e /var/lib/powerdns/bind-dnssec-db.sqlite3; then - echo [$0] Initializing /var/lib/powerdns/bind-dnssec-db.sqlite3 - /usr/bin/pdnsutil create-bind-db /var/lib/powerdns/bind-dnssec-db.sqlite3 -fi -sed -i 's/^# bind-dnssec-db=/bind-dnssec-db=\/var\/lib\/powerdns\/bind-dnssec-db.sqlite3/' /etc/powerdns/pdns.d/bind.conf - -# start powerdns server -/usr/sbin/pdns_server --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no & - -# watch for zone changes -inotifywait -mqre modify --exclude '.*(\.git|.*\.swp)' --format '%w%f' "/var/lib/powerdns/zones/" | - while read -r path; do - zone=$(basename $path) - echo [$0] A modification was detected in $path - echo [$0] Executing \`/usr/bin/pdns_control bind-reload-now $zone\` - /usr/bin/pdns_control bind-reload-now $zone - if pdnsutil show-zone $zone 2>/dev/null | grep -q "Zone is not actively secured"; then - echo [$0] Zone is not actively secured, skipping \`pdnsutil rectify-zone $zone\` - else - echo [$0] DNSSEC secured zone. Executing \`pdnsutil rectify-zone $zone\` - /usr/bin/pdnsutil rectify-zone $zone - fi - done & - -wait -n - -exit $?