From cbed7ea0f144200e05485d6263081fcdf300307f Mon Sep 17 00:00:00 2001 From: d11n Date: Wed, 4 May 2022 10:20:38 +0200 Subject: [PATCH] RTL: Upgrade to v0.12.3 (#638) This contains the cookie not being generated bugfix, see Ride-The-Lightning/RTL#994. Fixes btcpayserver/btcpayserver#3700. --- README.md | 2 +- contrib/build-all-images.sh | 40 +++++++++---------- .../docker-fragments/bitcoin-clightning.yml | 2 +- .../docker-fragments/bitcoin-eclair.yml | 4 +- .../docker-fragments/bitcoin-lnd.yml | 4 +- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index ea72aec..25fefee 100644 --- a/README.md +++ b/README.md @@ -340,7 +340,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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) | | saubyk/c-lightning-rest | 0.7.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.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.12.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | +| shahanafarooqui/rtl | 0.12.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.14.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | 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/btcpayserver | 1.5.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.5.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.5.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.5.1/arm64v8.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 60dc833..d245785 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -126,18 +126,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.12.2" +echo "Building shahanafarooqui/rtl:0.12.3" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.12.2 +git checkout v0.12.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.2" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.3" . cd - && cd .. @@ -154,18 +154,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.12.2" +echo "Building shahanafarooqui/rtl:0.12.3" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.12.2 +git checkout v0.12.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.2" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.3" . cd - && cd .. @@ -186,18 +186,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.2/dockerfiles/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.12.2" +echo "Building shahanafarooqui/rtl:0.12.3" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.12.2 +git checkout v0.12.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.2" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.3" . cd - && cd .. @@ -717,7 +717,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 .. @@ -1135,5 +1135,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/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index f3adf5e..f62c113 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -72,7 +72,7 @@ services: - "3001" bitcoin_rtl: - image: shahanafarooqui/rtl:0.12.2 + image: shahanafarooqui/rtl:0.12.3 restart: unless-stopped environment: LN_IMPLEMENTATION: CLT diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index b6022b2..af9d460 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.12.2 + image: shahanafarooqui/rtl:0.12.3 restart: unless-stopped environment: LN_IMPLEMENTATION: ECL @@ -78,4 +78,4 @@ required: - "opt-add-zmq" - "opt-txindex" exclusive: - - lightning \ No newline at end of file + - lightning diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 17b5cad..fab8601 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.12.2 + image: shahanafarooqui/rtl:0.12.3 restart: unless-stopped environment: LND_SERVER_URL: http://lnd_bitcoin:8080/v1 @@ -110,4 +110,4 @@ volumes: required: - "opt-add-zmq" exclusive: - - lightning \ No newline at end of file + - lightning