From ba3b2c2f950d0dc4d6b7101ec5d26a07cb57171f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 6 Jul 2019 21:57:13 +0900 Subject: [PATCH] update doc --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 2 ++ contrib/build-all-images.sh | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7a2cf54..1ed1cc2 100644 --- a/README.md +++ b/README.md @@ -323,7 +323,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | Source | Image | Version | x64 | arm32v7 | links | |---|---|---|:-:|:-:|:-:| | * | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | -| * | btcpayserver/docker-compose-builder | 1.23.2 | ️❌ | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.23.2/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-compose-builder) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-builder) | +| * | btcpayserver/docker-compose-builder | 1.23.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.23.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.23.2/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-compose-builder) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-builder) | | bitcoin.yml | btcpayserver/bitcoin | 0.18.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | bitcoin-clightning.yml | btcpayserver/lightning | v0.7.0-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0-3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0-3/contrib/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | bitcoin-clightning.yml | shesek/lightning-charge | 0.4.6-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.6/Dockerfile) | ️❌ | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index a7ee87a..4da267a 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -242,7 +242,9 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = "master"; break; case "docker-compose-builder": + dockerInfo.DockerFilePath = "linuxamd64.Dockerfile"; dockerInfo.DockerFilePathARM32v7 = "linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = "linuxarm64v8.Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/docker-compose-builder"; dockerInfo.GitRef = $"v{image.Tag}"; break; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 41628f1..0698e41 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -20,18 +20,19 @@ cd - && cd .. # Build docker-compose-builder -DOCKERFILE="" +# https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.23.2/linuxamd64.Dockerfile +DOCKERFILE="linuxamd64.Dockerfile" # https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.23.2/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -if [[ "$DOCKERFILE" ]]; then - echo "Building btcpayserver/docker-compose-builder:1.23.2" - git clone https://github.com/btcpayserver/docker-compose-builder docker-compose-builder - cd docker-compose-builder - git checkout v1.23.2 - cd "$(dirname $DOCKERFILE)" - docker build -f "$DOCKERFILE" -t "btcpayserver/docker-compose-builder:1.23.2" . - cd - && cd .. -fi +# https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.23.2/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" +echo "Building btcpayserver/docker-compose-builder:1.23.2" +git clone https://github.com/btcpayserver/docker-compose-builder docker-compose-builder +cd docker-compose-builder +git checkout v1.23.2 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-compose-builder:1.23.2" . +cd - && cd .. # Build btglnd