From 9cfcbc943c022eb571ce547f7397ca00d5f6007b Mon Sep 17 00:00:00 2001 From: rockstardev <5191402+rockstardev@users.noreply.github.com> Date: Wed, 28 Apr 2021 04:37:12 -0500 Subject: [PATCH] Bumping to v0.12.1-beta container and enabling Loop usage (#450) * Bumping to v0.12.1-beta container and enabling Loop usage * Adding environment variables for rest listen and loop * Starting lnd listeners on specific host * Restoring tlsextradomain and fixing bitcoin-lnd.yml params * Adding tool to recreate tls certificate in LND container * Using new version of LND 0.12.1-beta container with 15s wait * Tool will restart only LND container * Updating README file with appropriate version of LND Co-authored-by: rockstardev --- README.md | 2 +- Tools/lnd_delete_tls.sh | 16 ++++++++++++++++ .../docker-fragments/bitcoin-lnd.yml | 18 +++++++++++++----- 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100755 Tools/lnd_delete_tls.sh diff --git a/README.md b/README.md index 9a67862..f7db058 100644 --- a/README.md +++ b/README.md @@ -331,7 +331,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/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.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.11.0-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/lnd | v0.12.1-beta-15s | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-15s/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-15s/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-15s/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/btcpayserver | 1.0.7.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.7.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.7.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.7.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.51 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | diff --git a/Tools/lnd_delete_tls.sh b/Tools/lnd_delete_tls.sh new file mode 100755 index 0000000..265907f --- /dev/null +++ b/Tools/lnd_delete_tls.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +read -p "This script will delete LND's TLS certificate, so that's it's recreated on restart. Please keep in mind that you'll need to update external connections to LND that depend on TLS cert. Type 'yes' to confirm you want to proceed`echo $'\n> '`" yn +if [ $yn != "yes" ]; then + exit 0 +fi + +docker exec btcpayserver_lnd_bitcoin rm -rf /root/.lnd/tls.cert +docker exec btcpayserver_lnd_bitcoin rm -rf /root/.lnd/tls.key + +docker stop btcpayserver_lnd_bitcoin +docker start btcpayserver_lnd_bitcoin + +echo "LND TLS certificate recreated" \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index a67d3b7..4c5c509 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:v0.11.0-beta + image: btcpayserver/lnd:v0.12.1-beta-15s container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: @@ -12,29 +12,33 @@ services: LND_ALIAS: ${LIGHTNING_ALIAS} LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}" LND_READY_FILE: /root/.nbxplorer/btc_fully_synched + LND_REST_LISTEN_HOST: http://lnd_bitcoin:8080 + LND_HOST_FOR_LOOP: lnd_bitcoin:10009 LND_EXTRA_ARGS: | - restlisten=0.0.0.0:8080 + restlisten=lnd_bitcoin:8080 rpclisten=127.0.0.1:10008 - rpclisten=0.0.0.0:10009 + rpclisten=lnd_bitcoin:10009 bitcoin.node=bitcoind + bitcoind.rpchost=bitcoind:43782 bitcoind.rpcuser=lnd bitcoind.rpcpass=afixedpasswordbecauselndsuckswithcookiefile - bitcoind.rpchost=bitcoind:43782 bitcoind.zmqpubrawblock=tcp://bitcoind:28332 bitcoind.zmqpubrawtx=tcp://bitcoind:28333 adminmacaroonpath=/data/admin.macaroon invoicemacaroonpath=/data/invoice.macaroon readonlymacaroonpath=/data/readonly.macaroon - notls=1 tlsextradomain=lnd_bitcoin + no-rest-tls=1 protocol.wumbo-channels=1 ports: - "9735:9735" expose: - "8080" + - "8081" - "9735" volumes: - "lnd_bitcoin_datadir:/data" + - "lndloop_bitcoin_datadir:/root/.loop/${NBITCOIN_NETWORK:-regtest}" - "bitcoin_datadir:/deps/.bitcoin" - "nbxplorer_datadir:/root/.nbxplorer" links: @@ -46,6 +50,8 @@ services: environment: LND_SERVER_URL: http://lnd_bitcoin:8080/v1 MACAROON_PATH: /etc/lnd + SWAP_SERVER_URL: https://lnd_bitcoin:8081/v1 + SWAP_MACAROON_PATH: /etc/lndloop RTL_CONFIG_PATH: /data/ LND_CONFIG_PATH: /etc/lnd/lnd.conf BITCOIND_CONFIG_PATH: /etc/bitcoin/bitcoin.conf @@ -55,6 +61,7 @@ services: volumes: - "bitcoin_datadir:/etc/bitcoin" - "lnd_bitcoin_datadir:/etc/lnd" + - "lndloop_bitcoin_datadir:/etc/lndloop" - "lnd_bitcoin_rtl_datadir:/data" expose: - "3000" @@ -96,6 +103,7 @@ services: volumes: lnd_bitcoin_datadir: + lndloop_bitcoin_datadir: lnd_bitcoin_rtl_datadir: required: