From ccbcef3112a783d85226122a3512f71ff19de334 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 Jun 2023 22:24:46 +0900 Subject: [PATCH] bump btcpay --- README.md | 4 +- contrib/build-all-images.sh | 44 +++---------------- .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 4d4ec0e..b6ce702 100644 --- a/README.md +++ b/README.md @@ -342,13 +342,11 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | 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 | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | | btcpayserver/lightning | v23.05 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v23.05/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v23.05/contrib/docker/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v23.05/contrib/docker/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | -| shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | -| shesek/spark-wallet | 0.3.1-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.3.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.3.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.3.1/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.10.5 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.10.5/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.10.5/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.10.5/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.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.0/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.0/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.0/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.16.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.16.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.16.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.16.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcoin | 25.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/25.0/Bitcoin/25.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/25.0/Bitcoin/25.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/25.0/Bitcoin/25.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/btcpayserver | 1.10.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.10.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/monero | 0.18.2.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.2.2/Monero/0.18.2.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.2.2/Monero/0.18.2.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.2.2/Monero/0.18.2.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | nicolasdorier/nbxplorer | 2.3.64 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.64/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.64/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.64/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.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/build-all-images.sh b/contrib/build-all-images.sh index 8a91d05..7015926 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -77,38 +77,6 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v23.05" . cd - && cd .. -# Build lightning-charge -# https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile -DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building shesek/lightning-charge:0.4.23-1-standalone" -git clone https://github.com/ElementsProject/lightning-charge lightning-charge -cd lightning-charge -git checkout v0.4.23 -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shesek/lightning-charge:0.4.23-1-standalone" . -cd - && cd .. - - -# Build spark-wallet -# https://raw.githubusercontent.com/shesek/spark-wallet/v0.3.1/Dockerfile -DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/shesek/spark-wallet/v0.3.1/arm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/shesek/spark-wallet/v0.3.1/arm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building shesek/spark-wallet:0.3.1-standalone" -git clone https://github.com/shesek/spark-wallet spark-wallet -cd spark-wallet -git checkout v0.3.1 -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shesek/spark-wallet:0.3.1-standalone" . -cd - && cd .. - - # Build c-lightning-rest # https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.10.5/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" @@ -242,18 +210,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.2/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.3/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.2/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.3/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.2/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.3/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.10.2$?" +echo "Building btcpayserver/btcpayserver:1.10.3$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.10.2 +git checkout v1.10.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.10.2$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.10.3$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 1895c11..82d54d7 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.10.2$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.10.3$?} expose: - "49392" environment: