mirror of
https://github.com/klutchell/unbound-docker.git
synced 2026-10-16 16:02:58 +00:00
Update unbound package to 1.14.0
Signed-off-by: Kyle Harding <kyle@balena.io>
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
From 9cca912af9d5b276a1677a8f89f381aeb4f875c6 Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Harding <kyle@balena.io>
|
||||
Date: Mon, 13 Dec 2021 10:02:41 -0500
|
||||
Subject: [PATCH 1/1] package/unbound: bump version to 1.14.0
|
||||
|
||||
Signed-off-by: Kyle Harding <kyle@balena.io>
|
||||
---
|
||||
package/unbound/unbound.hash | 4 ++--
|
||||
package/unbound/unbound.mk | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash
|
||||
index 3c872aedf5..ca6fe174e0 100644
|
||||
--- a/package/unbound/unbound.hash
|
||||
+++ b/package/unbound/unbound.hash
|
||||
@@ -1,5 +1,5 @@
|
||||
-# From https://nlnetlabs.nl/downloads/unbound/unbound-1.13.2.tar.gz.sha256
|
||||
-sha256 0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83 unbound-1.13.2.tar.gz
|
||||
+# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256
|
||||
+sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE
|
||||
diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk
|
||||
index 37456db416..61fdc5389b 100644
|
||||
--- a/package/unbound/unbound.mk
|
||||
+++ b/package/unbound/unbound.mk
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
-UNBOUND_VERSION = 1.13.2
|
||||
+UNBOUND_VERSION = 1.14.0
|
||||
UNBOUND_SITE = https://www.unbound.net/downloads
|
||||
UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl
|
||||
UNBOUND_LICENSE = BSD-3-Clause
|
||||
--
|
||||
2.30.2
|
||||
|
||||
+14
-7
@@ -12,6 +12,7 @@ RUN apt-get update && \
|
||||
cmake \
|
||||
cpio \
|
||||
file \
|
||||
git \
|
||||
locales \
|
||||
python3 \
|
||||
rsync \
|
||||
@@ -29,23 +30,27 @@ USER br-user
|
||||
|
||||
WORKDIR /home/br-user
|
||||
|
||||
ENV HOME=/home/br-user
|
||||
|
||||
ENV LC_ALL=en_US.UTF-8
|
||||
|
||||
ARG BR_VERSION=2021.02.4
|
||||
ARG BR_VERSION=2021.11
|
||||
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
|
||||
RUN wget -q -O- https://buildroot.org/downloads/buildroot-$BR_VERSION.tar.gz | tar xz --strip 1
|
||||
RUN git clone --depth 1 --branch ${BR_VERSION} https://git.busybox.net/buildroot
|
||||
|
||||
FROM buildroot-base as rootfs
|
||||
|
||||
WORKDIR /home/br-user/buildroot
|
||||
|
||||
ARG TARGETARCH
|
||||
ARG TARGETVARIANT
|
||||
ARG ROOTFS_LIBC=musl
|
||||
|
||||
COPY config ./config
|
||||
COPY *.patch ./
|
||||
|
||||
COPY rootfs_overlay ./rootfs_overlay
|
||||
RUN git apply ./*.patch
|
||||
|
||||
COPY config ./config
|
||||
|
||||
RUN support/kconfig/merge_config.sh -m \
|
||||
config/common.cfg \
|
||||
@@ -53,6 +58,8 @@ RUN support/kconfig/merge_config.sh -m \
|
||||
config/libc/"${ROOTFS_LIBC}".cfg \
|
||||
config/unbound.cfg
|
||||
|
||||
COPY rootfs_overlay ./rootfs_overlay
|
||||
|
||||
RUN --mount=type=cache,target=/cache,uid=1000,gid=1000,sharing=private \
|
||||
make olddefconfig && make source && make
|
||||
|
||||
@@ -61,7 +68,7 @@ USER root
|
||||
|
||||
WORKDIR /rootfs
|
||||
|
||||
RUN tar xpf /home/br-user/output/images/rootfs.tar -C /rootfs
|
||||
RUN tar xpf /home/br-user/buildroot/output/images/rootfs.tar -C /rootfs
|
||||
|
||||
FROM scratch
|
||||
|
||||
|
||||
Reference in New Issue
Block a user