From 2dd3f775c6ebe857cfe8464f6efad9704cb99bbe Mon Sep 17 00:00:00 2001 From: MaHl111 <48538049+MaHl111@users.noreply.github.com> Date: Thu, 15 Sep 2022 08:22:37 +0200 Subject: [PATCH] Update building and base container to 2022.09.2 (#161) --- one-container/pihole-unbound/Dockerfile | 3 ++- one-container/pihole-unbound/VERSION | 2 +- one-container/pihole-unbound/build_and_push.sh | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/one-container/pihole-unbound/Dockerfile b/one-container/pihole-unbound/Dockerfile index becd8ec..40be7a8 100644 --- a/one-container/pihole-unbound/Dockerfile +++ b/one-container/pihole-unbound/Dockerfile @@ -1,4 +1,5 @@ -FROM pihole/pihole:2022.08.2 +ARG PIHOLE_VERSION +FROM pihole/pihole:${PIHOLE_VERSION:-latest} RUN apt update && apt install -y unbound COPY lighttpd-external.conf /etc/lighttpd/external.conf diff --git a/one-container/pihole-unbound/VERSION b/one-container/pihole-unbound/VERSION index 4393180..9945fc9 100644 --- a/one-container/pihole-unbound/VERSION +++ b/one-container/pihole-unbound/VERSION @@ -1 +1 @@ -2022.08.2 +2022.09.2 diff --git a/one-container/pihole-unbound/build_and_push.sh b/one-container/pihole-unbound/build_and_push.sh index 1570568..24e050d 100755 --- a/one-container/pihole-unbound/build_and_push.sh +++ b/one-container/pihole-unbound/build_and_push.sh @@ -1,6 +1,7 @@ #!/bin/bash # Run this once: docker buildx create --use --name build --node build --driver-opt network=host -docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t cbcrowe/pihole-unbound:`cat VERSION` --push . -docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t cbcrowe/pihole-unbound:latest --push . +PIHOLE_VER=`cat VERSION` +docker buildx build --build-arg PIHOLE_VERSION=$PIHOLE_VER --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t cbcrowe/pihole-unbound:$PIHOLE_VER --push . +docker buildx build --build-arg PIHOLE_VERSION=$PIHOLE_VER --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t cbcrowe/pihole-unbound:latest --push .