From d5d6a6a7dac04c6c4619f9d27e84b7a1487a1ac6 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 1 Mar 2021 13:17:07 +0900 Subject: [PATCH] Update pi-hole doc --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 6 +++--- contrib/build-all-images.sh | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e7f5af9..5742c51 100644 --- a/README.md +++ b/README.md @@ -340,7 +340,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | | 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.0 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_amd64) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_armhf) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_arm64) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | +| 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) | | btcpayserver/tor | 0.4.4.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | | postgres | 9.6.20 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index d5ac0c9..94677b7 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -234,9 +234,9 @@ namespace DockerFileBuildHelper { case "pihole": dockerInfo.GitLink = "https://github.com/pi-hole/docker-pi-hole"; - dockerInfo.DockerFilePath = $"Dockerfile_amd64"; - dockerInfo.DockerFilePathARM32v7 = $"Dockerfile_armhf"; - dockerInfo.DockerFilePathARM64v8 = $"Dockerfile_arm64"; + dockerInfo.DockerFilePath = $"Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; dockerInfo.GitRef = $"{image.Tag}"; dockerInfo.SupportedByUs = true; break; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 56bd1a0..7993325 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -672,18 +672,18 @@ cd - && cd .. # Build pihole -# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_amd64 -DOCKERFILE="Dockerfile_amd64" -# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_armhf -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile_armhf" -# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_arm64 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile_arm64" -echo "Building pihole/pihole:v5.0" +# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" +echo "Building pihole/pihole:v5.7" git clone https://github.com/pi-hole/docker-pi-hole pihole cd pihole -git checkout v5.0 +git checkout v5.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "pihole/pihole:v5.0" . +docker build -f "$DOCKERFILE" -t "pihole/pihole:v5.7" . cd - && cd ..