From bb5636ca1a56423d3228a53a8b06d0bd4b4bcbd2 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 2 Jun 2023 18:26:30 +0900 Subject: [PATCH] bump bitcoin and btcpay --- README.md | 4 +-- contrib/build-all-images.sh | 30 +++++++++---------- .../docker-fragments/bitcoin.yml | 2 +- .../docker-fragments/btcpayserver.yml | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b33944b..b6406bf 100644 --- a/README.md +++ b/README.md @@ -346,8 +346,8 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | saubyk/c-lightning-rest | 0.9.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.9.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.9.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.9.0/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.13.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.13.3/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.13.3/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.13.3/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 | 24.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/24.1-1/Bitcoin/24.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/24.1-1/Bitcoin/24.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/24.1-1/Bitcoin/24.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/btcpayserver | 1.10.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| 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.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.1/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/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 248e459..b189c28 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -202,18 +202,18 @@ cd - && cd .. # Build bitcoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/24.1-1/Bitcoin/24.1/linuxamd64.Dockerfile -DOCKERFILE="Bitcoin/24.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/24.1-1/Bitcoin/24.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/24.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/24.1-1/Bitcoin/24.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/24.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcoin:24.1-1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/25.0/Bitcoin/25.0/linuxamd64.Dockerfile +DOCKERFILE="Bitcoin/25.0/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/25.0/Bitcoin/25.0/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/25.0/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/25.0/Bitcoin/25.0/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/25.0/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/bitcoin:25.0" git clone https://github.com/btcpayserver/dockerfile-deps bitcoin cd bitcoin -git checkout Bitcoin/24.1-1 +git checkout Bitcoin/25.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:24.1-1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:25.0" . cd - && cd .. @@ -242,18 +242,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.0/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.1/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.0/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.1/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.0/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.10.1/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.10.0$?" +echo "Building btcpayserver/btcpayserver:1.10.1$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.10.0 +git checkout v1.10.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.10.0$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.10.1$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index 6292c98..22976fd 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -4,7 +4,7 @@ services: bitcoind: restart: unless-stopped container_name: btcpayserver_bitcoind - image: btcpayserver/bitcoin:24.1-1 + image: btcpayserver/bitcoin:25.0 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} CREATE_WALLET: "false" diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index d4f291a..517c342 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.0$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.10.1$?} expose: - "49392" environment: