Merge remote-tracking branch 'origin/master' into grs-clightning

Production/nginx.tmpl

@@ -175,7 +175,6 @@ upstream {{ $upstream_name }} {
 {{/* Get the VIRTUAL_ROOT By containers w/ use fastcgi root */}}
 {{ $vhost_root := or (first (groupByKeys $containers "Env.VIRTUAL_ROOT")) "/var/www/public" }}
 
-
 {{/* Get the first cert name defined by containers w/ the same vhost */}}
 {{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }}
 
@@ -321,6 +320,11 @@ server {
 		{{ if (eq $serviceName "clightning_bitcoin_spark") }}
 	location /spark/btc/ {
 		proxy_pass http://clightning_bitcoin_spark:9737/;
+	}
+		{{ end }}
+		{{ if (eq $serviceName "clightning_bitcoin_charge") }}
+	location /lightning-charge/btc/ {
+		proxy_pass http://clightning_bitcoin_charge:9112/;
 	}
 		{{ end }}
 		{{ if (eq $serviceName "clightning_groestlcoin_spark") }}

README.md

@@ -156,7 +156,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are:
 * [opt-save-storage-xxs](docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml) will keep around 2 weeks of blocks (prune BTC for 5 GB) (lightning not supported)
 * [opt-lnd-autopilot](docker-compose-generator/docker-fragments/opt-lnd-autopilot.yml) will activate auto pilot on LND. (5 channels, 60% of allocation)
 * [opt-save-memory](docker-compose-generator/docker-fragments/opt-save-memory.yml) will decrease the default dbcache at the expense of longer synchronization time (Useful if your machine is less than 2GB)
-* [opt-add-btcqbo](docker-compose-generator/docker-fragments/opt-add-btcqbo.yml) will allow you to create an invoice on Quickbooks which include a way for your customer to pay on BTCPay Server (More information on this [github repository](https://github.com/JeffVandrewJr/btcqbo/), this plugin is maintained by [JeffVandrewJr](https://github.com/JeffVandrewJr))
+* [opt-add-btcqbo](docker-compose-generator/docker-fragments/opt-add-btcqbo.yml) will allow you to create an invoice on Quickbooks which include a way for your customer to pay on BTCPay Server (More information on this [github repository](https://github.com/JeffVandrewJr/btcqbo/), this plugin is maintained by [JeffVandrewJr](https://github.com/JeffVandrewJr), see more on [this video](https://www.youtube.com/watch?v=srgwL9ozg6c))
 
 You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file).
 

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

@@ -21,8 +21,6 @@ services:
         NBXPLORER_CHAINS: "btg"
         NBXPLORER_BTGRPCURL: http://bgoldd:43782/
         NBXPLORER_BTGNODEENDPOINT: bgoldd:39388
-      links:
-        - bgoldd
       volumes:
         - "bgold_datadir:/root/.bitcoingold"
   btcpayserver:

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

@@ -27,9 +27,22 @@ services:
     links:
       - nbxplorer
       - bitcoind
+  clightning_bitcoin_charge:
+    image: shesek/lightning-charge:0.4.6-standalone
+    restart: unless-stopped
+    environment:
+      NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      COOKIE_FILE: /data/.cookie
+      URL: ${BTCPAY_ROOTPATH:-/}lightning-charge/btc/
+    volumes:
+      - "clightning_bitcoin_datadir:/etc/lightning"
+      - "clightning_bitcoin_charge:/data"
+    expose:
+      - "9112"
+    links:
+      - clightning_bitcoin
   clightning_bitcoin_spark:
-    image: shesek/spark-wallet:0.2.1-standalone
-    stop_signal: SIGKILL
+    image: shesek/spark-wallet:0.2.2-standalone
     restart: unless-stopped
     environment:
       NETWORK: ${NBITCOIN_NETWORK:-regtest}
@@ -45,11 +58,14 @@ services:
     environment:
       BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc"
       BTCPAY_BTCEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie"
+      BTCPAY_BTCEXTERNALCHARGE: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}lightning-charge/btc/;cookiefilepath=/etc/clightning_bitcoin_charge/.cookie"
     volumes:
       - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
       - "clightning_bitcoin_spark:/etc/clightning_bitcoin_spark"
+      - "clightning_bitcoin_charge:/etc/clightning_bitcoin_charge"
     links:
       - clightning_bitcoin
 volumes:
   clightning_bitcoin_datadir:
-  clightning_bitcoin_spark:
+  clightning_bitcoin_spark:
+  clightning_bitcoin_charge:

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

@@ -3,6 +3,7 @@ version: "3"
 services:
   lnd_bitcoin:
     image: btcpayserver/lnd:v0.5.1-beta
+    stop_signal: SIGKILL
     container_name: btcpayserver_lnd_bitcoin
     restart: unless-stopped
     environment:
@@ -40,8 +41,8 @@ services:
   btcpayserver:
     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"
+      BTCPAY_BTCEXTERNALLNDGRPC: "type=lnd-grpc;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;macaroondirectorypath=/etc/lnd_bitcoin"
+      BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;macaroondirectorypath=/etc/lnd_bitcoin"
     volumes:
       - "lnd_bitcoin_datadir:/etc/lnd_bitcoin"
     links:

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

@@ -22,8 +22,6 @@ services:
         NBXPLORER_CHAINS: "btc"
         NBXPLORER_BTCRPCURL: http://bitcoind:43782/
         NBXPLORER_BTCNODEENDPOINT: bitcoind:39388
-      links:
-        - bitcoind
       volumes:
         - "bitcoin_datadir:/root/.bitcoin"
   btcpayserver:

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

@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.31}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.36}
     expose:
       - "49392"
     environment:
@@ -18,7 +18,6 @@ services:
       BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE}
       BTCPAY_DEBUGLOG: btcpay.log
     links:
-      - nbxplorer
       - postgres
     volumes:
      - "btcpay_datadir:/datadir"

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

@@ -21,8 +21,6 @@ services:
         NBXPLORER_CHAINS: "dash"
         NBXPLORER_DASHRPCURL: http://dashd:9998/
         NBXPLORER_DASHNODEENDPOINT: dashd:9999
-      links:
-        - dashd
       volumes:
         - "dash_datadir:/root/.dashcore"
   btcpayserver:

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

@@ -31,8 +31,6 @@ services:
         NBXPLORER_DOGENODEENDPOINT: dogecoind:22556
         NBXPLORER_DOGERPCUSER: ceiwHEbqWI83
         NBXPLORER_DOGERPCPASSWORD: DwubwWsoo3
-      links:
-        - dogecoind
       volumes:
         - "dogecoin_datadir:/root/.dogecoin"
   btcpayserver:

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

@@ -21,8 +21,6 @@ services:
         NBXPLORER_CHAINS: "ftc"
         NBXPLORER_FTCRPCURL: http://feathercoind:43782/
         NBXPLORER_FTCNODEENDPOINT: feathercoind:39388
-      links:
-        - feathercoind
       volumes:
         - "feathercoin_datadir:/root/.feathercoin"
   btcpayserver:

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

@@ -21,8 +21,6 @@ services:
         NBXPLORER_CHAINS: "grs"
         NBXPLORER_GRSRPCURL: http://groestlcoind:43782/
         NBXPLORER_GRSNODEENDPOINT: groestlcoind:39388
-      links:
-        - groestlcoind
       volumes:
         - "groestlcoin_datadir:/root/.groestlcoin"
   btcpayserver:

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

@@ -3,6 +3,7 @@ version: "3"
 services:
   lnd_litecoin:
     image: btcpayserver/lnd:v0.5.1-beta
+    stop_signal: SIGKILL
     container_name: btcpayserver_lnd_litecoin
     restart: unless-stopped
     environment:

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

@@ -21,8 +21,6 @@ services:
         NBXPLORER_CHAINS: "ltc"
         NBXPLORER_LTCRPCURL: http://litecoind:43782/
         NBXPLORER_LTCNODEENDPOINT: litecoind:39388
-      links:
-        - litecoind
       volumes:
         - "litecoin_datadir:/root/.litecoin"
   btcpayserver:

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

@@ -21,8 +21,6 @@ services:
         NBXPLORER_CHAINS: "mona"
         NBXPLORER_MONARPCURL: http://monacoind:43782/
         NBXPLORER_MONANODEENDPOINT: monacoind:39388
-      links:
-        - monacoind
       volumes:
         - "monacoin_datadir:/root/.monacoin"
   btcpayserver:

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

@@ -13,8 +13,6 @@ services:
       - "nginx_vhost:/etc/nginx/vhost.d"
       - "nginx_html:/usr/share/nginx/html"
       - "nginx_certs:/etc/nginx/certs:ro"
-    links:
-      - btcpayserver
 
   nginx-gen:
     restart: unless-stopped
@@ -29,6 +27,7 @@ services:
       - "nginx_certs:/etc/nginx/certs:ro"
     entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     links:
+      - btcpayserver
       - nginx
 
   letsencrypt-nginx-proxy-companion:

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

@@ -21,8 +21,6 @@ services:
         NBXPLORER_CHAINS: "via"
         NBXPLORER_VIARPCURL: http://viacoind:43782/
         NBXPLORER_VIANODEENDPOINT: viacoind:39388
-      links:
-        - viacoind
       volumes:
         - "viacoin_datadir:/root/.viacoin"
   btcpayserver: