AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

bump docker-compose for new installs

Browse Source
This commit is contained in:
nicolas.dorier
2021-03-14 14:28:06 +09:00
parent e7c297bf4e
commit 0259d3163e
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/DockerFileBuildHelper/Program.cs
View File

@@ -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":

24
contrib/build-all-images.sh
View File

@@ -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 ..