From daa889dc2a9cc5b79e522d5a3bc1591f87ed20ea Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 8 Oct 2021 12:13:21 +0900 Subject: [PATCH] Revert "Revert "bump bitcoin core 22.0, fix issue about corrupt settings.json"" This reverts commit dcf0e554b4da7722d43299485bca834dbc6af977. --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin.yml | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 97e0477..fd56fb5 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H |---|---|:-:|:-:|:-:|:-:| | 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/bitcoin | 22.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | +| btcpayserver/bitcoin | 22.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/lightning | v0.10.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/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.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ee2b56e..f45f5ff 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/22.0/Bitcoin/22.0/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile DOCKERFILE="Bitcoin/22.0/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcoin:22.0" +echo "Building btcpayserver/bitcoin:22.0-1" git clone https://github.com/btcpayserver/dockerfile-deps bitcoin cd bitcoin -git checkout Bitcoin/22.0 +git checkout Bitcoin/22.0-1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0-1" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index 6060a14..e32e552 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:22.0 + image: btcpayserver/bitcoin:22.0-1 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_WALLETDIR: "/walletdata" @@ -18,7 +18,6 @@ services: port=39388 whitelist=0.0.0.0/0 maxmempool=500 - settings=false expose: - "43782" - "39388"