From d61050beaebc30be135c43e379a7dfb8f89d003b Mon Sep 17 00:00:00 2001 From: rockstardev <5191402+rockstardev@users.noreply.github.com> Date: Tue, 12 Nov 2024 09:46:21 -0600 Subject: [PATCH] Bumping RTL to v0.15.4 --- README.md | 2 +- contrib/build-all-images.sh | 44 +++---------------- .../docker-fragments/bitcoin-clightning.yml | 2 +- .../docker-fragments/bitcoin-eclair.yml | 2 +- .../docker-fragments/bitcoin-lnd.yml | 2 +- 5 files changed, 10 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 7593f71..504d59a 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ 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/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 | v24.05 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v24.05/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v24.05/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v24.05/Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | -| shahanafarooqui/rtl | 0.15.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.0/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.0/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.0/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | +| shahanafarooqui/rtl | v0.15.4 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.18.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.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.13.6$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.6/Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index a58a933..671a3df 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -62,18 +62,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.0/dockerfiles/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/dockerfiles/Dockerfile DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.0/dockerfiles/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/dockerfiles/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.0/dockerfiles/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/dockerfiles/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.15.0" +echo "Building shahanafarooqui/rtl:v0.15.4" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.15.0 +git checkout v0.15.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.15.0" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:v0.15.4" . cd - && cd .. @@ -89,22 +89,6 @@ docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.7.0" . cd - && cd .. -# Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.0/dockerfiles/Dockerfile -DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.0/dockerfiles/Dockerfile.arm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.0/dockerfiles/Dockerfile.arm64v8 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.14.0" -git clone https://github.com/Ride-The-Lightning/RTL rtl -cd rtl -git checkout v0.14.0 -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.14.0" . -cd - && cd .. - - # Build lnd # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.3-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" @@ -121,22 +105,6 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.18.3-beta" . cd - && cd .. -# Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.1/dockerfiles/Dockerfile -DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.1/dockerfiles/Dockerfile.arm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.14.1/dockerfiles/Dockerfile.arm64v8 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.14.1" -git clone https://github.com/Ride-The-Lightning/RTL rtl -cd rtl -git checkout v0.14.1 -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.14.1" . -cd - && cd .. - - # Build bitcoin # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/26.0/Bitcoin/26.0/linuxamd64.Dockerfile DOCKERFILE="Bitcoin/26.0/linuxamd64.Dockerfile" diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 1830963..d0d50e9 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -32,7 +32,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.15.0 + image: shahanafarooqui/rtl:v0.15.4 restart: unless-stopped environment: LN_IMPLEMENTATION: CLN diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index 595dccc..481b8fa 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -40,7 +40,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.14.0 + image: shahanafarooqui/rtl:v0.15.4 restart: unless-stopped environment: LN_IMPLEMENTATION: ECL diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 3d18654..5e32dca 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -46,7 +46,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.14.1 + image: shahanafarooqui/rtl:v0.15.4 container_name: generated_lnd_bitcoin_rtl_1 restart: unless-stopped environment: