From 3b04576e15be95f84f8a9fcf788d353bc9968dd8 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 19 Feb 2025 18:10:04 +0900 Subject: [PATCH] Revert "bump cloudflare" This reverts commit f60ad087402d96fc2521b7b47a0c871a0845a7cd. --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 6 +++--- contrib/build-all-images.sh | 18 +++++++++--------- .../docker-fragments/opt-add-cloudflared.yml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 2bcacf8..0ffc10c 100644 --- a/README.md +++ b/README.md @@ -352,7 +352,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | nginx | 1.25.3-bookworm | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.10.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/btctransmuter | 0.0.59 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | -| btcpayserver/cloudflared | 2024.8.2-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2-2/Cloudflared/2024.8.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2-2/Cloudflared/2024.8.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2-2/Cloudflared/2024.8.2/Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/cloudflared) | +| btcpayserver/cloudflared | 2024.8.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2/Cloudflared/2024.8.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2/Cloudflared/2024.8.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2024.8.2/Cloudflared/2024.8.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/cloudflared) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | | btcpayserver/joinmarket | 0.9.10 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 9b640d9..dca5916 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -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; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2625928..08b4b01 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -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 .. diff --git a/docker-compose-generator/docker-fragments/opt-add-cloudflared.yml b/docker-compose-generator/docker-fragments/opt-add-cloudflared.yml index 793b2aa..50541cb 100644 --- a/docker-compose-generator/docker-fragments/opt-add-cloudflared.yml +++ b/docker-compose-generator/docker-fragments/opt-add-cloudflared.yml @@ -3,7 +3,7 @@ version: "3" services: cloudflared: container_name: 'cloudflared-tunnel' - image: btcpayserver/cloudflared:2024.8.2-2 + image: btcpayserver/cloudflared:2024.8.2 command: 'tunnel --no-autoupdate run --token ${CLOUDFLARE_TUNNEL_TOKEN}' restart: 'on-failure' environment: