Merge branch 'master' into dcg-latest

Production-NoReverseProxy/README.md

@@ -33,7 +33,8 @@ With Powershell:
 $env:BTCPAY_ROOTPATH="/test";
 $env:BTCPAY_PROTOCOL="http";
 $env:BTCPAY_HOST="btcpay.example.com";
-docker-compose -f docker-compose.btc.yml up
+.\build.ps1
+docker-compose -f "Generated/docker-compose.generated.yml" up --remove-orphans -d
 ```
 
 With Linux:
@@ -42,7 +43,8 @@ With Linux:
 export BTCPAY_ROOTPATH="/test"
 export BTCPAY_PROTOCOL="http"
 export BTCPAY_HOST="btcpay.example.com"
-docker-compose -f docker-compose.btc.yml up
+./build.sh
+docker-compose -f "Generated/docker-compose.generated.yml" up --remove-orphans -d
 ```
 
 Then edit your [host file](https://www.howtogeek.com/howto/27350/beginner-geek-how-to-edit-your-hosts-file/) with

Production/nginx.tmpl

@@ -302,7 +302,11 @@ server {
 		{{ $serviceName := (index $container.Labels "com.docker.compose.service") }}
 		{{ if (eq $serviceName "lnd_bitcoin") }}
 				location /lnrpc.Lightning {
-						grpc_pass grpcs://lnd_bitcoin:10009;
+					grpc_pass grpcs://lnd_bitcoin:10009;
+				}
+				location /lnd-rest/btc/ {
+					rewrite ^/lnd-rest/btc/(.*) /$1 break;
+					proxy_pass http://lnd_bitcoin:8080/;
 				}
 		{{ end }}
 	{{ end }}

README.md

@@ -312,6 +312,8 @@ Yes, run the following commands to update:
 sudo su -
 
 cd $DOWNLOAD_ROOT/btcpayserver-docker
+git checkout master
+git pull
 git checkout 9acb5d8067cb5c46f59858137feb699b41ac9f19
 btcpay-update.sh
 . ./btcpay-setup.sh -i

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

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   clightning_bitcoin:
-    image: nicolasdorier/clightning:v0.6.1
+    image: nicolasdorier/clightning:v0.6.2
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:

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

@@ -39,6 +39,7 @@ services:
     environment:
       BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true"
       BTCPAY_BTCEXTERNALLNDGRPC: "type=lnd-grpc;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon"
+      BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon"
     volumes:
       - "lnd_bitcoin_datadir:/etc/lnd_bitcoin"
     links:

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

@@ -4,11 +4,12 @@ services:
   bitcoind:
       restart: unless-stopped
       container_name: btcpayserver_bitcoind
-      image: nicolasdorier/docker-bitcoin:0.16.3
+      image: nicolasdorier/docker-bitcoin:0.17.0
       environment:
+        BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
         BITCOIN_EXTRA_ARGS: |
+          deprecatedrpc=signrawtransaction
           rpcport=43782
-          ${NBITCOIN_NETWORK:-regtest}=1
           port=39388
           whitelist=0.0.0.0/0
       expose:

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

@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.106
+    image: nicolasdorier/btcpayserver:1.0.3.3
     expose:
       - "49392"
     environment:

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

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   clightning_litecoin:
-    image: nicolasdorier/clightning:v0.6.1
+    image: nicolasdorier/clightning:v0.6.2
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:

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

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

docker-compose-generator/docker-fragments/opt-save-storage-xs.yml

@@ -12,7 +12,7 @@ services:
   feathercoind:
     environment:
       BITCOIN_EXTRA_ARGS: prune=25000
-   groestlcoind:
+  groestlcoind:
     environment:
       BITCOIN_EXTRA_ARGS: prune=25000
   litecoind:

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

@@ -4,7 +4,7 @@ services:
   viacoind:
       restart: unless-stopped
       container_name: btcpayserver_viacoind
-      image: romanornr/docker-viacoin:0.15.1
+      image: romanornr/docker-viacoin:0.15.2
       environment:
         BITCOIN_EXTRA_ARGS: |
           rpcport=43782