Merge branch 'master' into main

one-container/pihole-unbound/Dockerfile

@@ -1,10 +1,11 @@
-FROM pihole/pihole:2022.02.1
+FROM pihole/pihole:2022.04.2
 RUN apt update && apt install -y unbound
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf 
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf
 COPY 99-edns.conf /etc/dnsmasq.d/99-edns.conf
-COPY start_unbound_and_s6_init.sh start_unbound_and_s6_init.sh
+RUN mkdir /etc/services.d/unbound
+COPY unbound-run /etc/services.d/unbound/run
+
+ENTRYPOINT ./s6-init
 
-RUN chmod +x start_unbound_and_s6_init.sh
-ENTRYPOINT ./start_unbound_and_s6_init.sh

one-container/pihole-unbound/VERSION

@@ -1 +1 @@
-2022.02.1
+2022.04.2

one-container/pihole-unbound/start_unbound_and_s6_init.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -e
-/etc/init.d/unbound start
-/s6-init

one-container/pihole-unbound/unbound-pihole.conf

@@ -52,4 +52,4 @@ server:
     private-address: 172.16.0.0/12
     private-address: 10.0.0.0/8
     private-address: fd00::/8
-    private-address: fe80::/10
+    private-address: fe80::/10

one-container/pihole-unbound/unbound-run

@@ -0,0 +1,25 @@
+#!/usr/bin/with-contenv bash
+
+s6-echo "Starting unbound"
+
+NAME="unbound"
+DESC="DNS server"
+DAEMON="/usr/sbin/unbound"
+PIDFILE="/run/unbound.pid"
+
+HELPER="/usr/lib/unbound/package-helper"
+
+test -x $DAEMON || exit 0
+
+# Override this variable by editing or creating /etc/default/unbound.
+DAEMON_OPTS=""
+
+if [ -f /etc/default/unbound ]; then
+    . /etc/default/unbound
+fi
+
+$HELPER chroot_setup
+$HELPER root_trust_anchor_update 2>&1 | logger -p daemon.info -t unbound-anchor
+
+$DAEMON -d $DAEMON_OPTS
+