From df71ca2d9155f3266d14025fbf868ede44c320a4 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 1 Feb 2024 10:17:25 +0900 Subject: [PATCH] bump BTCPay --- README.md | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 6 ++--- contrib/build-all-images.sh | 24 +++++++++---------- .../docker-fragments/btcpayserver.yml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 8146606a6..1906f6a6f 100644 --- a/README.md +++ b/README.md @@ -340,13 +340,13 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | 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-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/lightning | v23.08 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v23.08/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v23.08/contrib/docker/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v23.08/contrib/docker/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | saubyk/c-lightning-rest | 0.10.6 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.10.6/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.10.6/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.10.6/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | 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.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.17.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.17.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.17.3-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.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.4/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.4/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.4/Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.12.5$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.5/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.5.0 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.0/Dockerfile) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 2.2.9-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/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 18711ee17..953e52efb 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -283,9 +283,9 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.SupportedByUs = true; break; case "docker-compose-generator": - dockerInfo.DockerFilePath = "docker-compose-generator/linuxamd64.Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = "docker-compose-generator/linuxarm32v7.Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = "docker-compose-generator/linuxarm64v8.Dockerfile"; + dockerInfo.DockerFilePath = "docker-compose-generator/Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "docker-compose-generator/Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = "docker-compose-generator/Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/btcpayserver-docker"; dockerInfo.GitRef = $"dcg-latest"; dockerInfo.SupportedByUs = true; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 46f72b349..80af1a5b8 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -6,12 +6,12 @@ DOCKERFILE="" # Build docker-compose-generator -# https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile -DOCKERFILE="docker-compose-generator/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker-compose-generator/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker-compose-generator/linuxarm64v8.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/Dockerfile +DOCKERFILE="docker-compose-generator/Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker-compose-generator/Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker-compose-generator/Dockerfile" echo "Building btcpayserver/docker-compose-generator:latest" git clone https://github.com/btcpayserver/btcpayserver-docker docker-compose-generator cd docker-compose-generator @@ -194,18 +194,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.4/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.5/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.4/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.5/Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.4/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.12.5/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building btcpayserver/btcpayserver:1.12.4$?" +echo "Building btcpayserver/btcpayserver:1.12.5$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.12.4 +git checkout v1.12.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.12.4$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.12.5$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 802ca671e..5885e70fa 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -4,7 +4,7 @@ services: btcpayserver: restart: unless-stopped container_name: generated_btcpayserver_1 - image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.12.4$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.12.5$?} expose: - "49392" environment: