From bf436a81e3872087392b34e1e5bc8d3de4d4c7e7 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 28 Feb 2020 16:13:03 +0900 Subject: [PATCH] Update doc --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 1 + contrib/build-all-images.sh | 19 +++++++++---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2eb93b7..e5f3973 100644 --- a/README.md +++ b/README.md @@ -327,7 +327,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/btctransmuter | 0.0.51 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.51/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.51/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.51/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.19 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.19/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.19/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.19/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | -| pihole/pihole | v4.4 | ️❌ | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_armhf) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_arm64) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | +| pihole/pihole | v4.4 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_amd64) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_armhf) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_arm64) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.1.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | | postgres | 9.6.5 | [✔️](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 741a6e5..5893281 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -234,6 +234,7 @@ 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.GitRef = $"{image.Tag}"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 995e57f..52c3d95 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -612,20 +612,19 @@ cd - && cd .. # Build pihole -DOCKERFILE="" +# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_amd64 +DOCKERFILE="Dockerfile_amd64" # https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_armhf [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile_armhf" # https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v4.4/Dockerfile_arm64 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile_arm64" -if [[ "$DOCKERFILE" ]]; then - echo "Building pihole/pihole:v4.4" - git clone https://github.com/pi-hole/docker-pi-hole pihole - cd pihole - git checkout v4.4 - cd "$(dirname $DOCKERFILE)" - docker build -f "$DOCKERFILE" -t "pihole/pihole:v4.4" . - cd - && cd .. -fi +echo "Building pihole/pihole:v4.4" +git clone https://github.com/pi-hole/docker-pi-hole pihole +cd pihole +git checkout v4.4 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "pihole/pihole:v4.4" . +cd - && cd .. # Build docker-gen