From 0259d3163e9f247db617953cb01d9502fddabb35 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sun, 14 Mar 2021 14:28:06 +0900 Subject: [PATCH] bump docker-compose for new installs --- README.md | 2 +- btcpay-setup.sh | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 14 +++++------ contrib/build-all-images.sh | 24 +++++++++---------- .../src/DockerComposeDefinition.cs | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 2ea756e..07a9623 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 | Image | Version | x64 | arm32v7 | arm64v8 | 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) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | -| btcpayserver/docker-compose-builder | 1.24.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-compose-builder) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-builder) | +| btcpayserver/docker-compose | 1.28.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.5/docker-compose/1.28.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.5/docker-compose/1.28.5/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.5/docker-compose/1.28.5/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | | btcpayserver/bitcoin | 0.21.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.0/Bitcoin/0.21.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.0/Bitcoin/0.21.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.0/Bitcoin/0.21.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/lightning | v0.9.3-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.19-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 4b29798..83343f2 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -421,9 +421,9 @@ if ! [[ -x "$(command -v docker)" ]] || ! [[ -x "$(command -v docker-compose)" ] if ! [[ -x "$(command -v docker-compose)" ]]; then if ! [[ "$OSTYPE" == "darwin"* ]] && $HAS_DOCKER; then - echo "Trying to install docker-compose by using the docker-compose-builder ($(uname -m))" + echo "Trying to install docker-compose by using the btcpayserver/docker-compose ($(uname -m))" ! [[ -d "dist" ]] && mkdir dist - docker run --rm -v "$(pwd)/dist:/dist" btcpayserver/docker-compose-builder:1.24.1 + docker run --rm -v "$(pwd)/dist:/dist" btcpayserver/docker-compose:1.28.5 mv dist/docker-compose /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose rm -rf "dist" diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 94677b7..3089664 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -40,7 +40,7 @@ namespace DockerFileBuildHelper foreach (var image in new[] { Image.Parse("btcpayserver/docker-compose-generator"), - Image.Parse("btcpayserver/docker-compose-builder:1.24.1"), + Image.Parse("btcpayserver/docker-compose:1.28.5"), }.Concat(GetImages(fragmentDirectory))) { Console.WriteLine($"Image: {image.ToString()}"); @@ -253,12 +253,12 @@ namespace DockerFileBuildHelper dockerInfo.GitLink = "https://github.com/vutov/lnd"; 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}"; + case "docker-compose": + dockerInfo.DockerFilePath = $"docker-compose/{NoRevision(image.Tag)}/linuxamd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"docker-compose/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"docker-compose/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"docker-compose/{image.Tag}"; dockerInfo.SupportedByUs = true; break; case "docker-compose-generator": diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 7747918..4d0645f 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -21,19 +21,19 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/docker-compose-generator:latest" cd - && cd .. -# Build docker-compose-builder -# https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxamd64.Dockerfile -DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/docker-compose-builder:1.24.1" -git clone https://github.com/btcpayserver/docker-compose-builder docker-compose-builder -cd docker-compose-builder -git checkout v1.24.1 +# Build docker-compose +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.5/docker-compose/1.28.5/linuxamd64.Dockerfile +DOCKERFILE="docker-compose/1.28.5/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.5/docker-compose/1.28.5/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker-compose/1.28.5/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.5/docker-compose/1.28.5/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker-compose/1.28.5/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/docker-compose:1.28.5" +git clone https://github.com/btcpayserver/dockerfile-deps docker-compose +cd docker-compose +git checkout docker-compose/1.28.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-compose-builder:1.24.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-compose:1.28.5" . cd - && cd .. diff --git a/docker-compose-generator/src/DockerComposeDefinition.cs b/docker-compose-generator/src/DockerComposeDefinition.cs index 9d09f99..5cad180 100644 --- a/docker-compose-generator/src/DockerComposeDefinition.cs +++ b/docker-compose-generator/src/DockerComposeDefinition.cs @@ -169,7 +169,7 @@ namespace DockerGenerator PostProcess(output); var dockerImages = ((YamlMappingNode)output["services"]).Children.Select(kv => kv.Value["image"].ToString()).ToList(); - dockerImages.Add("btcpayserver/docker-compose-builder:1.24.1"); + dockerImages.Add("btcpayserver/docker-compose:1.28.5"); dockerImages.Add("btcpayserver/docker-compose-generator:latest"); StringBuilder pullImageSh = new StringBuilder(); pullImageSh.Append($"#!/bin/bash\n\n");