From 8cade5a8af3b2827020d39f07393e779f8b23e7c Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Fri, 17 Oct 2025 22:32:08 -0700 Subject: chore: actually add the server blocks --- src/unbound-adblock/Dockerfile | 3 ++- src/unbound-adblock/VERSION | 2 +- src/unbound-adblock/bin/entrypoint.sh | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/unbound-adblock/Dockerfile b/src/unbound-adblock/Dockerfile index bd5939f..849feb3 100644 --- a/src/unbound-adblock/Dockerfile +++ b/src/unbound-adblock/Dockerfile @@ -1,8 +1,9 @@ ARG BASE_VER=latest FROM public.ecr.aws/x2w2w0z4/base:${BASE_VER} +RUN install_deb unbound unbound-anchor COPY bin/entrypoint.sh /usr/bin/entrypoint.sh COPY etc/unbound.base.conf /etc/unbound/unbound.conf.d/unbound.base.conf -RUN install_deb unbound unbound-anchor +COPY etc/zones/ /etc/unbound/unbound.conf.d/ ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/src/unbound-adblock/VERSION b/src/unbound-adblock/VERSION index f9cece5..5c314e5 100644 --- a/src/unbound-adblock/VERSION +++ b/src/unbound-adblock/VERSION @@ -1 +1 @@ -v0.0.3 +v0.0.5 diff --git a/src/unbound-adblock/bin/entrypoint.sh b/src/unbound-adblock/bin/entrypoint.sh index b9dd19d..c2577fb 100755 --- a/src/unbound-adblock/bin/entrypoint.sh +++ b/src/unbound-adblock/bin/entrypoint.sh @@ -15,12 +15,13 @@ else fi # Update root trust anchor +# This is kind of weird... +# https://manpages.debian.org/testing/unbound-anchor/unbound-anchor.8.en.html#EXIT_CODE log "Updating root trust anchor..." if unbound-anchor -a /var/lib/unbound/root.key; then - log "Root trust anchor updated successfully" + log "no update was necessary" else - log "ERROR: Root trust anchor update failed" - exit 1 + log "The root anchor was updated using the certificate or if the builtin root-anchor was used." fi # Start unbound in debug mode -- cgit v1.2.3