From 44a36be7752438d8cf19e5b07b7cbafbe9e96afb Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 18 Dec 2020 23:05:47 +0900 Subject: [PATCH] Update doc --- README.md | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 2 +- contrib/build-all-images.sh | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 32e3c1b..6ff7202 100644 --- a/README.md +++ b/README.md @@ -356,14 +356,14 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/elements | 0.18.1.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.7/Elements/0.18.1.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.7/Elements/0.18.1.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.7/Elements/0.18.1.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | -| btcpayserver/monero | 0.17.1.6 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | +| btcpayserver/monero | 0.17.1.7 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | redis | 5.0.2-alpine | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | -| apotdevin/thunderhub | v0.11.0 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.11.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.11.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.11.0/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | +| apotdevin/thunderhub | base-v0.12.0 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.6-wordpress-5.5.3-php-7.4.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-wordpress-5.5.3-php-7.4.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | traefik | latest | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 33505a5..dcfe26c 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -558,7 +558,7 @@ namespace DockerFileBuildHelper dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile"; dockerInfo.DockerFilePathARM64v8 = "arm64v8.Dockerfile"; dockerInfo.GitLink = "https://github.com/apotdevin/thunderhub"; - dockerInfo.GitRef = $"{image.Tag.Split('-')[0]}"; + dockerInfo.GitRef = $"{image.Tag.Split('-')[1]}"; dockerInfo.SupportedByUs = false; break; case "python-teos": diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 869c46d..2b1eeef 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -446,24 +446,24 @@ cd - && cd .. # Build monero # https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.17.1.6" +echo "Building btcpayserver/monero:0.17.1.7" git clone https://github.com/Kukks/monero-docker monero cd monero git checkout x86_64 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.1.6" . +docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.1.7" . cd - && cd .. # Build monero # https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.17.1.6" +echo "Building btcpayserver/monero:0.17.1.7" git clone https://github.com/Kukks/monero-docker monero cd monero git checkout x86_64 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.1.6" . +docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.1.7" . cd - && cd .. @@ -688,18 +688,18 @@ cd - && cd .. # Build thunderhub -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.11.0/Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.11.0/arm32v7.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.11.0/arm64v8.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building apotdevin/thunderhub:v0.11.0" +echo "Building apotdevin/thunderhub:base-v0.12.0" git clone https://github.com/apotdevin/thunderhub thunderhub cd thunderhub -git checkout v0.11.0 +git checkout v0.12.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.11.0" . +docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.12.0" . cd - && cd ..