From 23813c1596bfb3eb68a4511012b7a54f47aba6a0 Mon Sep 17 00:00:00 2001 From: Markus Petzsch Date: Tue, 8 Aug 2023 22:37:48 +0200 Subject: [PATCH] update pihole to 2023.05.2 (#823) --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/opt-add-pihole.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e5e2f2c..aec0740 100644 --- a/README.md +++ b/README.md @@ -358,7 +358,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | btcpayserver/eps | 0.2.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | | btcpayserver/joinmarket | 0.9.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.5/JoinMarket/0.9.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.5/JoinMarket/0.9.5/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.5/JoinMarket/0.9.5/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | -| pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | +| pihole/pihole | 2023.05.2 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.7.10 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.10/Tor/0.4.7.10/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.10/Tor/0.4.7.10/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.10/Tor/0.4.7.10/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | | btcpayserver/woocommerce | 3.1.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxamd64.Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/woocommerce) | | btcpayserver/postgres | 13.10 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.10/Postgres/13.10/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.10/Postgres/13.10/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.10/Postgres/13.10/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2460e29..faffaf8 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -830,18 +830,18 @@ cd - && cd .. # Build pihole -# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile +# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile +# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile +# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building pihole/pihole:v5.7" +echo "Building pihole/pihole:2023.05.2" git clone https://github.com/pi-hole/docker-pi-hole pihole cd pihole -git checkout v5.7 +git checkout 2023.05.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "pihole/pihole:v5.7" . +docker build -f "$DOCKERFILE" -t "pihole/pihole:2023.05.2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-pihole.yml b/docker-compose-generator/docker-fragments/opt-add-pihole.yml index 82426f0..fa2f8d6 100644 --- a/docker-compose-generator/docker-fragments/opt-add-pihole.yml +++ b/docker-compose-generator/docker-fragments/opt-add-pihole.yml @@ -3,7 +3,7 @@ services: pihole: restart: unless-stopped container_name: pihole - image: pihole/pihole:v5.7 + image: pihole/pihole:2023.05.2 environment: ServerIP: "${PIHOLE_SERVERIP:-127.0.0.1}" VIRTUAL_HOST: pi.hole