Merge branch 'update/lnd-clightning'

docker-compose-generator/docker-fragments/bitcoin-clightning.yml

@@ -2,21 +2,19 @@ version: "3"
 
 services:
   clightning_bitcoin:
-    image: btcpayserver/lightning:v0.7.0-1
+    image: btcpayserver/lightning:v0.7.0-2
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
       LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       LIGHTNINGD_CHAIN: btc
-      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
+      LIGHTNINGD_ALIAS: ${LIGHTNING_ALIAS}
+      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_HOST}:9735
+      LIGHTNINGD_NBXPLORER_ROOT: /root/.nbxplorer
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
-        announce-addr=${BTCPAY_HOST}:9735
         bind-addr=0.0.0.0:9735
-        network=${NBITCOIN_NETWORK:-regtest}
-        alias=${LIGHTNING_ALIAS}
-        chain=btc
     volumes:
       - "clightning_bitcoin_datadir:/root/.lightning"
       - "bitcoin_datadir:/etc/bitcoin"
@@ -24,7 +22,6 @@ services:
     ports:
       - "9735:9735"
     links:
-      - nbxplorer
       - bitcoind
   clightning_bitcoin_charge:
     image: shesek/lightning-charge:0.4.6-standalone

docker-compose-generator/docker-fragments/bitcoin-lnd.yml

@@ -2,13 +2,15 @@ version: "3"
 
 services:
   lnd_bitcoin:
-    image: btcpayserver/lnd:v0.5.2-beta
+    image: btcpayserver/lnd:v0.5.2-beta-2
     container_name: btcpayserver_lnd_bitcoin
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
+      LND_EXTERNALIP: ${BTCPAY_HOST}:9735
+      LND_ALIAS: ${LIGHTNING_ALIAS}
       LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
-      LND_EXPLORERURL: "http://nbxplorer:32838/"
+      LND_NBXPLORER_ROOT: /root/.nbxplorer
       LND_EXTRA_ARGS: |
         restlisten=0.0.0.0:8080
         rpclisten=127.0.0.1:10008
@@ -17,8 +19,6 @@ services:
         bitcoind.rpchost=bitcoind:43782
         bitcoind.zmqpubrawblock=tcp://bitcoind:28332
         bitcoind.zmqpubrawtx=tcp://bitcoind:28333
-        externalip=${BTCPAY_HOST}:9735
-        alias=${LIGHTNING_ALIAS}
         adminmacaroonpath=/data/admin.macaroon
         invoicemacaroonpath=/data/invoice.macaroon
         readonlymacaroonpath=/data/readonly.macaroon
@@ -34,7 +34,6 @@ services:
       - "bitcoin_datadir:/deps/.bitcoin"
       - "nbxplorer_datadir:/root/.nbxplorer"
     links:
-      - nbxplorer
       - bitcoind
 
   lnd_bitcoin_rtl:

docker-compose-generator/docker-fragments/litecoin-clightning.yml

@@ -2,21 +2,19 @@ version: "3"
 
 services:
   clightning_litecoin:
-    image: btcpayserver/lightning:v0.7.0-1
+    image: btcpayserver/lightning:v0.7.0-2
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
       LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       LIGHTNINGD_CHAIN: ltc
-      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
+      LIGHTNINGD_ALIAS: ${LIGHTNING_ALIAS}
+      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_HOST}:9735
+      LIGHTNINGD_NBXPLORER_ROOT: /root/.nbxplorer
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
         bind-addr=0.0.0.0:9735
-        announce-addr=${BTCPAY_HOST}:9736
-        network=${NBITCOIN_NETWORK:-regtest}
-        alias=${LIGHTNING_ALIAS}
-        chain=ltc
     volumes:
       - "clightning_litecoin_datadir:/root/.lightning"
       - "litecoin_datadir:/etc/litecoin"
@@ -24,7 +22,6 @@ services:
     ports:
       - "9736:9735"
     links:
-      - nbxplorer
       - litecoind
   btcpayserver:
     environment:

docker-compose-generator/docker-fragments/litecoin-lnd.yml

@@ -2,23 +2,26 @@ version: "3"
 
 services:
   lnd_litecoin:
-    image: btcpayserver/lnd:v0.5.2-beta
+    image: btcpayserver/lnd:v0.5.2-beta-2
     container_name: btcpayserver_lnd_litecoin
     restart: unless-stopped
     environment:
       LND_CHAIN: "ltc"
+      LND_EXTERNALIP: ${BTCPAY_HOST}:9735
+      LND_ALIAS: ${LIGHTNING_ALIAS}
       LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
-      LND_EXPLORERURL: "http://nbxplorer:32838/"
+      LND_NBXPLORER_ROOT: /root/.nbxplorer
       LND_EXTRA_ARGS: |
         restlisten=0.0.0.0:8080
+        rpclisten=127.0.0.1:10008
+        rpclisten=0.0.0.0:10009
         litecoin.node=litecoind
         litecoind.rpchost=litecoind:43782
         litecoind.zmqpubrawblock=tcp://litecoind:28332
         litecoind.zmqpubrawtx=tcp://litecoind:28333
-        externalip=${BTCPAY_HOST}:9736
-        alias=${LIGHTNING_ALIAS}
         adminmacaroonpath=/data/admin.macaroon
         invoicemacaroonpath=/data/invoice.macaroon
+        readonlymacaroonpath=/data/readonly.macaroon
         noseedbackup=1
         notls=1
     ports:
@@ -31,7 +34,6 @@ services:
       - "litecoin_datadir:/deps/.litecoin"
       - "nbxplorer_datadir:/root/.nbxplorer"
     links:
-      - nbxplorer
       - litecoind
 
   btcpayserver:

docker-compose-generator/docker-fragments/nbxplorer.yml

@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.0.0.16
+    image: nicolasdorier/nbxplorer:2.0.0.17
     expose: 
       - "32838"
     environment: