From b53d970148219ba2569b2b4046c1c45e20679808 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 22 Dec 2023 14:30:49 +0900 Subject: [PATCH] Update btcpay --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 6 +++--- contrib/build-all-images.sh | 18 +++++++++--------- .../docker-fragments/btcpayserver.yml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index c5860c6..29f8695 100644 --- a/README.md +++ b/README.md @@ -347,7 +347,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | shahanafarooqui/rtl | 0.14.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.1/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.1/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.1/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.17.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.17.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.17.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.17.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcoin | 26.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/26.0/Bitcoin/26.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/26.0/Bitcoin/26.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/26.0/Bitcoin/26.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/btcpayserver | 1.12.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.12.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.3/Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/monero | 0.18.3.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.1/Monero/0.18.3.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.1/Monero/0.18.3.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.1/Monero/0.18.3.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | nicolasdorier/nbxplorer | 2.4.3 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.3/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.3/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.3/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 2.2.9-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-1/Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 57b08b2..b3580e0 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -456,9 +456,9 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = $"Dash/{image.Tag}"; break; case "btcpayserver": - dockerInfo.DockerFilePath = "amd64.Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = "arm64v8.Dockerfile"; + dockerInfo.DockerFilePath = "Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = "Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/btcpayserver"; // v1.0.5.4$ dockerInfo.GitRef = $"v{image.Tag.Substring(0, image.Tag.IndexOf('$'))}"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index c48cfd5..8dfebec 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -210,18 +210,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.2/amd64.Dockerfile -DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.2/arm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.2/arm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.12.2$?" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.3/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.3/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.3/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" +echo "Building btcpayserver/btcpayserver:1.12.3$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.12.2 +git checkout v1.12.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.12.2$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.12.3$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 4aa88e0..6d8a3e5 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -3,7 +3,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.12.2$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.12.3$?} expose: - "49392" environment: