all: sync with master; upd chlog

docker/Dockerfile

@@ -0,0 +1,87 @@
+# A docker file for scripts/make/build-docker.sh.
+
+FROM alpine:3.17
+
+ARG BUILD_DATE
+ARG VERSION
+ARG VCS_REF
+
+LABEL\
+	maintainer="AdGuard Team <devteam@adguard.com>" \
+	org.opencontainers.image.authors="AdGuard Team <devteam@adguard.com>" \
+	org.opencontainers.image.created=$BUILD_DATE \
+	org.opencontainers.image.description="Network-wide ads & trackers blocking DNS server" \
+	org.opencontainers.image.documentation="https://github.com/AdguardTeam/AdGuardHome/wiki/" \
+	org.opencontainers.image.licenses="GPL-3.0" \
+	org.opencontainers.image.revision=$VCS_REF \
+	org.opencontainers.image.source="https://github.com/AdguardTeam/AdGuardHome" \
+	org.opencontainers.image.title="AdGuard Home" \
+	org.opencontainers.image.url="https://adguard.com/en/adguard-home/overview.html" \
+	org.opencontainers.image.vendor="AdGuard" \
+	org.opencontainers.image.version=$VERSION
+
+# Update certificates.
+RUN apk --no-cache add ca-certificates libcap tzdata && \
+	mkdir -p /opt/adguardhome/conf /opt/adguardhome/work && \
+	chown -R nobody: /opt/adguardhome
+
+RUN apk --no-cache add tini
+
+ARG DIST_DIR
+ARG TARGETARCH
+ARG TARGETOS
+ARG TARGETVARIANT
+
+COPY --chown=nobody:nogroup\
+	./${DIST_DIR}/docker/AdGuardHome_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT}\
+	/opt/adguardhome/AdGuardHome
+
+RUN setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome
+
+# 53     : TCP, UDP : DNS
+# 67     :      UDP : DHCP (server)
+# 68     :      UDP : DHCP (client)
+# 80     : TCP      : HTTP (main)
+# 443    : TCP, UDP : HTTPS, DNS-over-HTTPS (incl. HTTP/3), DNSCrypt (main)
+# 784    :      UDP : DNS-over-QUIC (experimental)
+# 853    : TCP, UDP : DNS-over-TLS, DNS-over-QUIC
+# 3000   : TCP, UDP : HTTP(S) (alt, incl. HTTP/3)
+# 3001   : TCP, UDP : HTTP(S) (beta, incl. HTTP/3)
+# 5443   : TCP, UDP : DNSCrypt (alt)
+# 6060   : TCP      : HTTP (pprof)
+# 8853   :      UDP : DNS-over-QUIC (experimental)
+#
+# TODO(a.garipov): Remove the old, non-standard 784 and 8853 ports for
+# DNS-over-QUIC in a future release.
+EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\
+	853/tcp 853/udp 3000/tcp 3000/udp 5443/tcp\
+	5443/udp 6060/tcp 8853/udp
+
+WORKDIR /opt/adguardhome/work
+
+# Install helpers for healthcheck.
+COPY --chown=nobody:nogroup\
+	./${DIST_DIR}/docker/scripts\
+	/opt/adguardhome/scripts
+
+HEALTHCHECK \
+	--interval=30s \
+	--timeout=10s \
+	--retries=3 \
+	CMD [ "/opt/adguardhome/scripts/healthcheck.sh" ]
+
+# It seems that the healthckech script sometimes spawns zombie processes, so we
+# need a way to handle them, since AdGuard Home doesn't know how to keep track
+# of the processes delegated to it by the OS.  Use tini as entry point because
+# it needs the PID=1 to be the default parent for orphaned processes.
+#
+# See https://github.com/adguardTeam/adGuardHome/issues/3290.
+ENTRYPOINT [ "/sbin/tini", "--" ]
+
+CMD [ \
+	"/opt/adguardhome/AdGuardHome", \
+	"--no-check-update", \
+	"-c", "/opt/adguardhome/conf/AdGuardHome.yaml", \
+	"-h", "0.0.0.0", \
+	"-w", "/opt/adguardhome/work" \
+]

docker/dns-bind.awk

@@ -0,0 +1,22 @@
+/^[^[:space:]]/ { is_dns = /^dns:/ }
+
+/^[[:space:]]+bind_hosts:/ { if (is_dns) prev_line = FNR }
+
+/^[[:space:]]+- .+/ {
+    if (FNR - prev_line == 1) {
+        addrs[addrsnum++] = $2
+        prev_line = FNR
+    }
+}
+
+/^[[:space:]]+port:/ { if (is_dns) port = $2 }
+
+END {
+    for (i in addrs) {
+        if (match(addrs[i], ":")) {
+            print "[" addrs[i] "]:" port
+        } else {
+            print addrs[i] ":" port
+        }
+    }
+}

docker/healthcheck.sh

@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# AdGuard Home Docker healthcheck script
+
+# Exit the script if a pipeline fails (-e), prevent accidental filename
+# expansion (-f), and consider undefined variables as errors (-u).
+set -e -f -u
+
+# Function error_exit is an echo wrapper that writes to stderr and stops the
+# script execution with code 1.
+error_exit() {
+	echo "$1" 1>&2
+
+	exit 1
+}
+
+agh_dir="/opt/adguardhome"
+readonly agh_dir
+
+filename="${agh_dir}/conf/AdGuardHome.yaml"
+readonly filename
+
+if ! [ -f "$filename" ]
+then
+    wget "http://127.0.0.1:3000" -O /dev/null -q || exit 1
+
+    exit 0
+fi
+
+help_dir="${agh_dir}/scripts"
+readonly help_dir
+
+# Parse web host
+
+web_url="$( awk -f "${help_dir}/web-bind.awk" "$filename" )"
+readonly web_url
+
+if [ "$web_url" = '' ]
+then
+    error_exit "no web bindings could be retrieved from $filename"
+fi
+
+# TODO(e.burkov):  Deal with 0 port.
+case "$web_url"
+in
+(*':0')
+    error_exit '0 in web port is not supported by healthcheck'
+    ;;
+(*)
+    # Go on.
+    ;;
+esac
+
+# Parse DNS hosts
+
+dns_hosts="$( awk -f "${help_dir}/dns-bind.awk" "$filename" )"
+readonly dns_hosts
+
+if [ "$dns_hosts" = '' ]
+then
+    error_exit "no DNS bindings could be retrieved from $filename"
+fi
+
+# TODO(e.burkov):  Deal with 0 port.
+case "$( echo "$dns_hosts" | head -n 1 )"
+in
+(*':0')
+    error_exit '0 in DNS port is not supported by healthcheck'
+    ;;
+(*)
+    # Go on.
+    ;;
+esac
+
+# Check
+
+# Skip SSL certificate validation since there is no guarantee the container
+# trusts the one used.  It should be safe to drop the SSL validation since the
+# current script intended to be used from inside the container and only checks
+# the endpoint availability, ignoring the content of the response.
+#
+# See https://github.com/AdguardTeam/AdGuardHome/issues/5642.
+wget --no-check-certificate "$web_url" -O /dev/null -q || exit 1
+
+echo "$dns_hosts" | while read -r host
+do
+    nslookup -type=a healthcheck.adguardhome.test. "$host" > /dev/null ||\
+        error_exit "nslookup failed for $host"
+done

docker/web-bind.awk

@@ -0,0 +1,13 @@
+# Don't consider the HTTPS hostname since the enforced HTTPS redirection should
+# work if the SSL check skipped.  See file docker/healthcheck.sh.
+/^bind_host:/ { host = $2 }
+
+/^bind_port:/ { port = $2 }
+
+END {
+    if (match(host, ":")) {
+        print "http://[" host "]:" port
+     } else {
+        print "http://" host ":" port
+    }
+}