Release 2.5.0 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.5.0 2023-08-30 <dave at tiredofit dot ca>
+
+   ### Added
+      - Unbound 1.18.0
+      - Switch to using packaged version and start compiling from source
+
+
 ## 2.4.1 2023-05-10 <dave at tiredofit dot ca>
 
    ### Changed

Dockerfile

@@ -4,7 +4,10 @@ ARG DISTRO_VARIANT="3.18"
 FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-ENV CONTAINER_ENABLE_MESSAGING=FALSE \
+ARG UNBOUND_VERSION
+ENV UNBOUND_VERSION=${UNBOUND_VERSION:-"release-1.18.0"} \
+    UNBOUND_REPO_URL=https://github.com/NLnetLabs/unbound \
+    CONTAINER_ENABLE_MESSAGING=FALSE \
     IMAGE_NAME="tiredofit/unbound" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-unbound/"
 
@@ -14,10 +17,52 @@ RUN source /assets/functions/00-container && \
     adduser -S -D -H -h /var/spool/postfix -s /sbin/nologin -G unbound -u 5353 unbound && \
     package update && \
     package upgrade && \
+    package install .unbound-build-deps \
+                        bison \
+                        build-base \
+                        expat-dev \
+                        flex \
+                        libevent-dev \
+                        linux-headers \
+                        openssl-dev \
+                        protobuf-c-dev \
+                        python3-dev \
+                        swig \
+                        && \
     package install .unbound-run-deps \
-               openssl \
-               unbound \
-               && \
+                        dnssec-root \
+                        expat \
+                        libevent \
+                        openssl \
+                        protobuf-c \
+                        && \
+    \
+    clone_git_repo "${UNBOUND_REPO_URL}" "${UNBOUND_VERSION}" && \mkdir -p /usr/src/unbound && \
+    export CFLAGS="$CFLAGS -flto=auto" && \
+	PYTHON_VERSION=3 ./configure \
+		--build="$CBUILD" \
+		--host="$CHOST" \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--with-username=unbound \
+		--with-run-dir="" \
+		--with-pidfile="" \
+		--with-rootkey-file=/usr/share/dnssec-root/trusted-key.key \
+		--with-libevent \
+		--with-pthreads \
+		--disable-static \
+		--disable-rpath \
+		--enable-dnstap \
+		--with-ssl \
+		--without-pythonmodule \
+		--with-pyunbound && \
+    \
+	sed -i -e '/^LIBS=/s/-lpython.*[[:space:]]/ /' Makefile && \
+	make -j$(nproc)&& \
+    make install && \
+    package remove .unbound-install-deps && \
     package cleanup
 
 EXPOSE 53

install/etc/services.available/10-unbound/run

@@ -8,5 +8,5 @@ check_container_initialized
 check_service_initialized init
 liftoff
 
-print_start "Starting Unbound"
+print_start "Starting Unbound $(echo "${UNBOUND_VERSION}" | sed 's|release||g')"
 exec unbound -c "${CONFIG_PATH}""${CONFIG_FILE}" -d