From 982465c1347ad02333341268f91f99306718c786 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 6 Mar 2020 06:23:00 +0100 Subject: [PATCH] Bump RTL (#273) * Bump RTL This also reverts commit cc829e5fe07a6fadfe89a31ec392487eef215aba. * fix config * fix config path for clightning --- README.md | 2 +- contrib/build-all-images.sh | 24 +++++++++---------- .../docker-fragments/bitcoin-clightning.yml | 5 ++-- .../docker-fragments/bitcoin-lnd.yml | 4 ++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ba991d7..c827677 100644 --- a/README.md +++ b/README.md @@ -316,7 +316,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/lightning-charge | 0.4.16-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.16/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.16/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.16/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.2.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/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.6.3 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | +| shahanafarooqui/rtl | 0.6.7 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.8.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.8.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.8.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.8.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/btcpayserver | 1.0.3.164 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.164/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.164/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.164/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.13 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.13/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.13/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.13/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 96d323b..263fa79 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -126,18 +126,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.6.3" +echo "Building shahanafarooqui/rtl:0.6.7" git clone https://github.com/ShahanaFarooqui/RTL rtl cd rtl -git checkout v0.6.3 +git checkout v0.6.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.6.3" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.6.7" . cd - && cd .. @@ -170,18 +170,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.4/Dockerfile +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.4/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.4/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.5.4" +echo "Building shahanafarooqui/rtl:0.6.7" git clone https://github.com/ShahanaFarooqui/RTL rtl cd rtl -git checkout v0.5.4 +git checkout v0.6.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.5.4" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.6.7" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 4b1a3de..1e4b9e1 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -69,13 +69,14 @@ services: - "3001" bitcoin_rtl: - image: shahanafarooqui/rtl:0.6.3 + image: shahanafarooqui/rtl:0.6.7 restart: unless-stopped environment: LN_IMPLEMENTATION: CLT + CONFIG_PATH: /root/.lightning/config LN_SERVER_URL: http://clightning_bitcoin_rest:3001/v1 MACAROON_PATH: /etc/clightning_bitcoin_rest/certs - RTL_CONFIG_PATH: /data/RTL.conf + RTL_CONFIG_PATH: /data/ BITCOIND_CONFIG_PATH: /etc/bitcoin/bitcoin.conf RTL_SSO: 1 RTL_COOKIE_PATH: /data/.cookie diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 0c0ed4b..42d6cde 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -39,13 +39,13 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.5.4 + image: shahanafarooqui/rtl:0.6.7 restart: unless-stopped environment: LND_SERVER_URL: http://lnd_bitcoin:8080/v1 MACAROON_PATH: /etc/lnd + RTL_CONFIG_PATH: /data/ LND_CONFIG_PATH: /etc/lnd/lnd.conf - RTL_CONFIG_PATH: /data/RTL.conf BITCOIND_CONFIG_PATH: /etc/bitcoin/bitcoin.conf RTL_SSO: 1 RTL_COOKIE_PATH: /data/.cookie