AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Revert "bump cloudflare"

Browse Source 
This reverts commit f60ad08740.
This commit is contained in:
nicolas.dorier
2025-02-19 18:10:04 +09:00
parent f60ad08740
commit 3b04576e15
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/DockerFileBuildHelper/Program.cs
View File

@@ -255,9 +255,9 @@ namespace DockerFileBuildHelper
dockerInfo.SupportedByUs = true;
break;
case "cloudflared":
dockerInfo.DockerFilePath = $"Cloudflared/{NoRevision(image.Tag)}/Dockerfile";
dockerInfo.DockerFilePathARM32v7 = dockerInfo.DockerFilePath;
dockerInfo.DockerFilePathARM64v8 = dockerInfo.DockerFilePath;
dockerInfo.DockerFilePath = $"Cloudflared/{NoRevision(image.Tag)}/linuxamd64.Dockerfile";
dockerInfo.DockerFilePathARM32v7 = $"Cloudflared/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile";
dockerInfo.DockerFilePathARM64v8 = $"Cloudflared/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile";
dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps";
dockerInfo.GitRef = $"Cloudflared/{image.Tag}";
dockerInfo.SupportedByUs = true;

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

@@ -576,18 +576,18 @@ cd - && cd ..
# Build cloudflared
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2-2/Cloudflared/2024.8.2/Dockerfile
DOCKERFILE="Cloudflared/2024.8.2/Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2-2/Cloudflared/2024.8.2/Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Cloudflared/2024.8.2/Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2-2/Cloudflared/2024.8.2/Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Cloudflared/2024.8.2/Dockerfile"
echo "Building btcpayserver/cloudflared:2024.8.2-2"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2/Cloudflared/2024.8.2/linuxamd64.Dockerfile
DOCKERFILE="Cloudflared/2024.8.2/linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2/Cloudflared/2024.8.2/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Cloudflared/2024.8.2/linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2/Cloudflared/2024.8.2/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Cloudflared/2024.8.2/linuxarm64v8.Dockerfile"
echo "Building btcpayserver/cloudflared:2024.8.2"
git clone https://github.com/btcpayserver/dockerfile-deps cloudflared
cd cloudflared
git checkout Cloudflared/2024.8.2-2
git checkout Cloudflared/2024.8.2
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/cloudflared:2024.8.2-2" .
docker build -f "$DOCKERFILE" -t "btcpayserver/cloudflared:2024.8.2" .
cd - && cd ..