refactor(dns): standardize pihole and unbound modules with docker.io

- Change docker-ce to docker.io and move check to top of both modules
- Improve container/image detection with proper filtering
- Add already-installed check in install commands
- Improve remove commands with better feedback
- Add unbound.conf configuration file creation
- Update unbound to use alpinelinux/unbound image
- Update port mapping to use module_options consistently
- Update pi-hole DNS upstream to use unbound on port 5335

Author: igorpecovnik

tests/unbound.conf

@@ -0,0 +1,9 @@
+ENABLED=true
+RELEASE="noble"
+TESTNAME="Unbound install"
+
+testcase() {(
+	./bin/armbian-config --api module_unbound purge
+	./bin/armbian-config --api module_unbound install
+	./bin/armbian-config --api module_unbound status
+)}

tools/modules/software/module_pi-hole.sh

@@ -8,7 +8,7 @@ module_options+=(
 	["module_pi_hole,doc_link"]="https://docs.pi-hole.net/"
 	["module_pi_hole,group"]="DNS"
 	["module_pi_hole,port"]="8811"
-	["module_pi_hole,arch"]=""
+	["module_pi_hole,arch"]="x86-64 arm64"
 )
 #
 # Module Pi-Hole
@@ -17,18 +17,23 @@ function module_pi_hole () {
 	local title="pihole"
 	local condition=$(which "$title" 2>/dev/null)
 
-	if pkg_installed docker-ce; then
-		local container=$(docker container ls -a | mawk '/pihole?( |$)/{print $1}')
-		local image=$(docker image ls -a | mawk '/pihole?( |$)/{print $3}')
-	fi
+	pkg_installed docker.io || module_docker install
+	local container=$(docker container ls -a --filter 'name=^/pihole$' --format '{{.ID}}')
+	local image=$(docker image ls -a --filter 'reference=pihole/pihole:*' --format '{{.Repository}}:{{.Tag}}' | head -1)
+
 	local commands
 	IFS=' ' read -r -a commands <<< "${module_options["module_pi_hole,example"]}"
 
 	PIHOLE_BASE="${SOFTWARE_FOLDER}/pihole"
 
 	case "$1" in
 		"${commands[0]}")
-			pkg_installed docker-ce || module_docker install
+			# Check if the module is already installed
+			if [[ "${container}" && "${image}" ]]; then
+				echo "Pi-hole container is already installed."
+				exit 0
+			fi
+
 			if ! docker container ls -a --format '{{.Names}}' | grep -q '^unbound$'; then module_unbound install; fi
 			local unbound_ip=$(docker inspect --format '{{ .NetworkSettings.Networks.lsio.IPAddress }}' unbound)
 			[[ -d "$PIHOLE_BASE" ]] || mkdir -p "$PIHOLE_BASE" || { echo "Couldn't create storage directory: $PIHOLE_BASE"; exit 1; }
@@ -50,7 +55,7 @@ function module_pi_hole () {
 			-e VIRTUAL_HOST="pi.hole" \
 			-e PROXY_LOCATION="pi.hole" \
 			-e FTLCONF_LOCAL_IPV4="${LOCALIPADD}" \
-			-e FTLCONF_dns_upstreams="${unbound_ip}" \
+			-e FTLCONF_dns_upstreams="unbound#5335" \
 			pihole/pihole:latest
 			for i in $(seq 1 20); do
 				if docker inspect -f '{{ index .Config.Labels "build_version" }}' pihole >/dev/null 2>&1 ; then
@@ -77,8 +82,13 @@ function module_pi_hole () {
 			${module_options["module_pi_hole,feature"]} ${commands[3]}
 		;;
 		"${commands[1]}")
-			[[ "${container}" ]] && docker container rm -f "$container" >/dev/null
-			[[ "${image}" ]] && docker image rm "$image" >/dev/null
+			if [[ "${container}" ]]; then
+				echo "Removing container: $container"
+				docker container rm -f "$container"
+			fi
+			if [[ "${image}" ]]; then
+				docker image rm "$image"
+			fi
 			# restore DNS settings
 			if srv_active systemd-resolved; then
 				mkdir -p /etc/systemd/resolved.conf.d/

tools/modules/software/module_unbound.sh

@@ -7,7 +7,7 @@ module_options+=(
 	["module_unbound,status"]="Active"
 	["module_unbound,doc_link"]="https://unbound.docs.nlnetlabs.nl/en/latest/"
 	["module_unbound,group"]="DNS"
-	["module_unbound,port"]="8053"
+	["module_unbound,port"]="5335"
 	["module_unbound,arch"]="x86-64"
 )
 #
@@ -17,10 +17,9 @@ function module_unbound () {
 	local title="unbound"
 	local condition=$(which "$title" 2>/dev/null)
 
-	if pkg_installed docker-ce; then
-		local container=$(docker container ls -a | mawk '/unbound?( |$)/{print $1}')
-		local image=$(docker image ls -a | mawk '/unbound?( |$)/{print $3}')
-	fi
+	pkg_installed docker.io || module_docker install
+	local container=$(docker container ls -a --filter "name=unbound" --format '{{.ID}}')
+	local image=$(docker image ls -a --format '{{.Repository}}:{{.Tag}}' | grep 'alpinelinux/unbound:' | head -1)
 
 	local commands
 	IFS=' ' read -r -a commands <<< "${module_options["module_unbound,example"]}"
@@ -29,17 +28,37 @@ function module_unbound () {
 
 	case "$1" in
 		"${commands[0]}")
-			pkg_installed docker-ce || module_docker install
+			# Check if the module is already installed
+			if [[ "${container}" && "${image}" ]]; then
+				echo "Unbound container is already installed."
+				return 0
+			fi
+
 			[[ -d "$UNBOUND_BASE" ]] || mkdir -p "$UNBOUND_BASE" || { echo "Couldn't create storage directory: $UNBOUND_BASE"; exit 1; }
+
+			# Create unbound.conf
+			cat > "${UNBOUND_BASE}/unbound.conf" <<-EOT
+			server:
+				interface: 0.0.0.0
+				port: 5335
+				access-control: 0.0.0.0/0 allow
+				do-ip4: yes
+				do-udp: yes
+				do-tcp: yes
+				do-ip6: no
+				verbosity: 1
+			EOT
+
 			docker run -d \
 			--net=lsio \
 			-e PUID=1000 \
 			-e PGID=1000 \
-			-p ${module_options["module_unbound,port"]}:53/tcp \
-			-p ${module_options["module_unbound,port"]}:53/udp \
+			-p ${module_options["module_unbound,port"]}:${module_options["module_unbound,port"]}/tcp \
+			-p ${module_options["module_unbound,port"]}:${module_options["module_unbound,port"]}/udp \
+			-v ${UNBOUND_BASE}/unbound.conf:/etc/unbound/unbound.conf:ro \
 			--name unbound \
 			--restart=unless-stopped \
-			mvance/unbound:latest
+			alpinelinux/unbound
 			for i in $(seq 1 20); do
 				if docker inspect -f '{{ index .Config.Labels "build_version" }}' unbound >/dev/null 2>&1 ; then
 					break
@@ -53,8 +72,13 @@ function module_unbound () {
 			done
 		;;
 		"${commands[1]}")
-			[[ "${container}" ]] && docker container rm -f "$container" >/dev/null
-			[[ "${image}" ]] && docker image rm "$image" >/dev/null
+			if [[ "${container}" ]]; then
+				echo "Removing container: $container"
+				docker container rm -f "$container"
+			fi
+			if [[ "${image}" ]]; then
+				docker image rm "$image"
+			fi
 		;;
 		"${commands[2]}")
 			${module_options["module_unbound,feature"]} ${commands[1]}