From fa06b7fefaa77f66ff42d0cb534ce8aba7c39250 Mon Sep 17 00:00:00 2001 From: gruve-p Date: Fri, 15 Dec 2023 21:44:02 +0100 Subject: [PATCH] Bump Groestlcoin Core to 26.0 and lightning --- README.md | 4 +-- contrib/build-all-images.sh | 30 +++++++++---------- .../groestlcoin-clightning.yml | 6 ++-- .../docker-fragments/groestlcoin.yml | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 81c9a4dc1..02e967bda 100644 --- a/README.md +++ b/README.md @@ -371,12 +371,12 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | btcpayserver/dash | 19.2.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/19.2.0/Dash/19.2.0/linuxamd64.Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/19.2.0/Dash/19.2.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | | btcpayserver/dogecoin | 1.14.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.6/Dogecoin/1.14.6/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | -| groestlcoin/lightning | v23.05 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v23.05/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | +| groestlcoin/lightning | v23.11 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v23.11/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | | groestlcoin/groestlcoin-lightning-charge | version-0.4.22 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-lightning-charge) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-lightning-charge) | | groestlcoin/groestlcoin-spark | version-0.2.16 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.16/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) | | groestlcoin/eclair | v0.6.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) | | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) | -| btcpayserver/groestlcoin | 25.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/25.0/Groestlcoin/25.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/25.0/Groestlcoin/25.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/25.0/Groestlcoin/25.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/groestlcoin) | +| btcpayserver/groestlcoin | 26.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/26.0/Groestlcoin/26.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/26.0/Groestlcoin/26.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/26.0/Groestlcoin/26.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/groestlcoin) | | btcpayserver/elements | 22.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/22.1.1/Elements/22.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/22.1.1/Elements/22.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/22.1.1/Elements/22.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.21.2.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.20.2 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.20.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 67fb94f7a..918cbc8fd 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -264,14 +264,14 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/Groestlcoin/lightning/v23.05/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/lightning/v23.11/Dockerfile DOCKERFILE="Dockerfile" -echo "Building groestlcoin/lightning:v23.05" +echo "Building groestlcoin/lightning:v23.11" git clone https://github.com/Groestlcoin/lightning lightning cd lightning -git checkout v23.05 +git checkout v23.11 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v23.05" . +docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v23.11" . cd - && cd .. @@ -324,18 +324,18 @@ cd - && cd .. # Build groestlcoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/25.0/Groestlcoin/25.0/linuxamd64.Dockerfile -DOCKERFILE="Groestlcoin/25.0/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/25.0/Groestlcoin/25.0/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Groestlcoin/25.0/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/25.0/Groestlcoin/25.0/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Groestlcoin/25.0/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/groestlcoin:25.0" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/26.0/Groestlcoin/26.0/linuxamd64.Dockerfile +DOCKERFILE="Groestlcoin/26.0/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/26.0/Groestlcoin/26.0/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Groestlcoin/26.0/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/25.0/Groestlcoin/26.0/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Groestlcoin/26.0/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/groestlcoin:26.0" git clone https://github.com/btcpayserver/dockerfile-deps groestlcoin cd groestlcoin -git checkout Groestlcoin/25.0 +git checkout Groestlcoin/26.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/groestlcoin:25.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/groestlcoin:26.0" . cd - && cd .. @@ -677,7 +677,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -1177,5 +1177,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index d3a6687bc..d949cd268 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: groestlcoin/lightning:v23.05 + image: groestlcoin/lightning:v23.11 container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped environment: @@ -13,8 +13,8 @@ services: LIGHTNINGD_PORT: 9736 LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/groestlcoin - bitcoin-rpcconnect=groestlcoind + groestlcoin-datadir=/etc/groestlcoin + groestlcoin-rpcconnect=groestlcoind volumes: - "clightning_groestlcoin_datadir:/root/.lightning" - "groestlcoin_datadir:/etc/groestlcoin" diff --git a/docker-compose-generator/docker-fragments/groestlcoin.yml b/docker-compose-generator/docker-fragments/groestlcoin.yml index b525523fb..d6981af78 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin.yml @@ -4,7 +4,7 @@ services: groestlcoind: restart: unless-stopped container_name: btcpayserver_groestlcoind - image: btcpayserver/groestlcoin:25.0 + image: btcpayserver/groestlcoin:26.0 environment: GROESTLCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} GROESTLCOIN_WALLETDIR: "/walletdata"