.drone.yml

@@ -1,91 +0,0 @@
-kind: pipeline
-type: docker
-name: build
-
-steps:
-  - name: build
-    image: docker:dind
-    volumes:
-      - name: dockersock
-        path: /var/run
-    environment:
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-    commands:
-      - sleep 5 # give docker enough time to start
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - ./debian/12/build.sh
-      - ./debian/13/build.sh
-    when:
-      branch:
-      - master
-      event:
-      - push
-
-services:
-  - name: docker
-    image: docker:dind
-    privileged: true
-    volumes:
-      - name: dockersock
-        path: /var/run
-    command:
-    - dockerd-entrypoint.sh
-    - dockerd
-    - --host=unix:///var/run/docker.sock
-    - --mtu=1492
-
-volumes:
-  - name: dockersock
-    temp: {}
-
-trigger:
-  branch:
-    - master
-  event:
-    - push
----
-kind: pipeline
-type: docker
-name: rebuild
-
-steps:
-  - name: rebuild
-    image: docker:dind
-    volumes:
-      - name: dockersock
-        path: /var/run
-    environment:
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-    commands:
-      - sleep 5 # give docker enough time to start
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - ./build/rebuild.sh
-
-services:
-  - name: docker
-    image: docker:dind
-    privileged: true
-    volumes:
-      - name: dockersock
-        path: /var/run
-    command:
-    - dockerd-entrypoint.sh
-    - dockerd
-    - --host=unix:///var/run/docker.sock
-    - --mtu=1492
-
-volumes:
-  - name: dockersock
-    temp: {}
-
-trigger:
-  event:
-    - cron
-  cron:
-    - rebuild

README.md

@@ -7,8 +7,8 @@
 
 # Supported tags and respective `Dockerfile` links
 
--	[`4.6-bookworm`](https://git.nethuis.nl/pommi/docker-powerdns/src/branch/master/debian/12/Dockerfile)
--	[`4.9-trixie`, `latest`](https://git.nethuis.nl/pommi/docker-powerdns/src/branch/master/debian/13/Dockerfile)
+-	[`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
 
@@ -87,15 +87,3 @@ DS = example.tld. IN DS 280 13 1 0dead339b7dacebb6750c7d4e5c9c0f4c19843a9 ; ( SH
 DS = example.tld. IN DS 280 13 2 f340e93c42b3c2c6fa8ef76e044ad2f064c1cd7484e785bdfca0f51cd548c88d ; ( SHA256 digest )
 DS = example.tld. IN DS 280 13 4 a793c7e590a7701c7b39365f99655b865d11961c355a5eb59302282cf653aec8b051ddc9e36a9df0843cad29ca50149a ; ( SHA-384 digest )
 ```
-
-Set `SOA-EDIT` to `INCEPTION-INCREMENT` so that slaves get notified when a rollover has taken place:
-```
-$ docker exec -it powerdns pdnsutil set-meta example.tld SOA-EDIT INCEPTION-INCREMENT
-[bindbackend] Done parsing domains, 0 rejected, 1 new, 0 removed
-Set 'example.tld' meta SOA-EDIT = INCEPTION-INCREMENT
-
-$ docker exec -it powerdns pdnsutil get-meta example.tld
-[bindbackend] Done parsing domains, 0 rejected, 1 new, 0 removed
-Metadata for 'example.tld'
-SOA-EDIT = INCEPTION-INCREMENT
-```

build/rebuild.sh

@@ -1,20 +1,18 @@
 #!/bin/sh
 
-set -x
-
 updates_available () {
     docker pull $1
-    if test "$(docker run --rm $1 /bin/sh -c 'apt -qqq update && apt -qq list --upgradable')" != ""; then
+    if test "$(docker run -it --rm $1 /bin/sh -c 'apt -qqq update && apt -qq list --upgradable')" != ""; then
         return 0
     else
         return 1
     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
-
-if updates_available pommib/powerdns:4.9-trixie; then
-    ./debian/13/build.sh
-fi

debian/11/Dockerfile

@@ -1,15 +1,15 @@
-FROM debian:trixie-slim
+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 \
+RUN set -eux; \
+	apt-get update; \
+	apt-get upgrade -y; \
+	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 /

debian/11/build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -x
+
+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

debian/11/start.sh

@@ -11,7 +11,7 @@ sed -i 's/^# bind-dnssec-db=/bind-dnssec-db=\/var\/lib\/powerdns\/bind-dnssec-db
 /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/" |
+inotifywait -mqre modify --exclude '\.git' --format '%w%f' "/var/lib/powerdns/zones/" |
     while read -r path; do
         zone=$(basename $path)
         echo [$0] A modification was detected in $path

debian/12/Dockerfile

@@ -1,15 +1,15 @@
 FROM debian:bookworm-slim
 
-RUN set -eux && \
-	apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN set -eux; \
+	apt-get update; \
+	apt-get upgrade -y; \
+	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 /

debian/12/build.sh

@@ -1,9 +1,12 @@
 #!/bin/sh
 
-set -ex
+set -x
 
 IMAGE=pommib/powerdns:4.6-bookworm
 docker pull $IMAGE
 docker pull debian:bookworm-slim
 docker build --no-cache -t $IMAGE ./debian/12/
 docker push $IMAGE
+
+docker tag $IMAGE pommib/powerdns:latest
+docker push pommib/powerdns:latest

debian/12/start.sh

@@ -11,7 +11,7 @@ sed -i 's/^# bind-dnssec-db=/bind-dnssec-db=\/var\/lib\/powerdns\/bind-dnssec-db
 /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/" |
+inotifywait -mqre modify --exclude '\.git' --format '%w%f' "/var/lib/powerdns/zones/" |
     while read -r path; do
         zone=$(basename $path)
         echo [$0] A modification was detected in $path

debian/13/build.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-IMAGE=pommib/powerdns:4.9-trixie
-docker pull $IMAGE
-docker pull debian:trixie-slim
-docker build --no-cache -t $IMAGE ./debian/13/
-docker push $IMAGE
-
-docker tag $IMAGE pommib/powerdns:latest
-docker push pommib/powerdns:latest