From 5f09e53e4d89bdd0dfbd0f152fea05d6875fb364 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Dec 2018 13:40:59 +0900
Subject: [PATCH 01/16] btcpayserver containers does not have to restart if
 nbxplorer goes down

---
 docker-compose-generator/docker-fragments/btcpayserver.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index c5d54d3..6e38c65 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -18,7 +18,6 @@ services:
       BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE}
       BTCPAY_DEBUGLOG: btcpay.log
     links:
-      - nbxplorer
       - postgres
     volumes:
      - "btcpay_datadir:/datadir"

From 88bd288d76885deed08bcd55232b0a2d07b2f405 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Dec 2018 13:45:57 +0900
Subject: [PATCH 02/16] NBXplorer does not have to restart if nodes get updated

---
 docker-compose-generator/docker-fragments/bgold.yml       | 2 --
 docker-compose-generator/docker-fragments/bitcoin.yml     | 2 --
 docker-compose-generator/docker-fragments/dash.yml        | 2 --
 docker-compose-generator/docker-fragments/dogecoin.yml    | 2 --
 docker-compose-generator/docker-fragments/feathercoin.yml | 2 --
 docker-compose-generator/docker-fragments/groestlcoin.yml | 2 --
 docker-compose-generator/docker-fragments/litecoin.yml    | 2 --
 docker-compose-generator/docker-fragments/monacoin.yml    | 2 --
 docker-compose-generator/docker-fragments/viacoin.yml     | 2 --
 9 files changed, 18 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/bgold.yml b/docker-compose-generator/docker-fragments/bgold.yml
index b45df64..a7fa24c 100644
--- a/docker-compose-generator/docker-fragments/bgold.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml
index b56ccf5..e1250e1 100644
--- a/docker-compose-generator/docker-fragments/bitcoin.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml
index 922f904..5ea6e00 100644
--- a/docker-compose-generator/docker-fragments/dash.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/dogecoin.yml b/docker-compose-generator/docker-fragments/dogecoin.yml
index 57642ec..a421a4d 100644
--- a/docker-compose-generator/docker-fragments/dogecoin.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/feathercoin.yml b/docker-compose-generator/docker-fragments/feathercoin.yml
index 5d97802..c58ca64 100644
--- a/docker-compose-generator/docker-fragments/feathercoin.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/groestlcoin.yml b/docker-compose-generator/docker-fragments/groestlcoin.yml
index 7e0e2f9..eb45cb4 100644
--- a/docker-compose-generator/docker-fragments/groestlcoin.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml
index 3391261..eed2799 100644
--- a/docker-compose-generator/docker-fragments/litecoin.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/monacoin.yml b/docker-compose-generator/docker-fragments/monacoin.yml
index c9f788e..9c43203 100644
--- a/docker-compose-generator/docker-fragments/monacoin.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/viacoin.yml b/docker-compose-generator/docker-fragments/viacoin.yml
index ac03f79..b6dc015 100644
--- a/docker-compose-generator/docker-fragments/viacoin.yml
+++ b/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:

From 498452805baa7ab908da07faeb0254b2898ee246 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Dec 2018 13:54:39 +0900
Subject: [PATCH 03/16] Add link to quickbook integration

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e4e906..4a54094 100644
--- a/README.md
+++ b/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).
 

From 3e3f4b268e99e7f44e668580fa0f13c5e1db9db9 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Dec 2018 17:12:46 +0900
Subject: [PATCH 04/16] bump

---
 docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index 6e38c65..c80fca0 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/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.32}
     expose:
       - "49392"
     environment:

From 5dc2a744e2ea7d2ac374334f40dbe757f26c5ca0 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Dec 2018 20:13:28 +0900
Subject: [PATCH 05/16] bump

---
 docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index c80fca0..4db082d 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.32}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.33}
     expose:
       - "49392"
     environment:

From b5228363460f2253c4ba3bc331b31bf95c896c30 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Dec 2018 20:17:57 +0900
Subject: [PATCH 06/16] Add macaroondirectorypath

---
 docker-compose-generator/docker-fragments/bitcoin-lnd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index 9b9d189..327d171 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -40,8 +40,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:

From 24d059d316ec2920eb6b7160df942cb96fc6a17e Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 21 Dec 2018 14:04:18 +0900
Subject: [PATCH 07/16] nginx does not have to restart if btcpayserver restart

---
 docker-compose-generator/docker-fragments/nginx.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml
index 9084d5a..db595d0 100644
--- a/docker-compose-generator/docker-fragments/nginx.yml
+++ b/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:

From 54a85a40befa60acb1d1b191a6263a40509b2584 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 21 Dec 2018 16:46:21 +0900
Subject: [PATCH 08/16] charge integration

---
 Production/nginx.tmpl                         |  5 +++++
 .../docker-fragments/bitcoin-clightning.yml   | 19 ++++++++++++++++++-
 .../docker-fragments/btcpayserver.yml         |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 8691739..aeeb5a6 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -321,6 +321,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 /ligthning-charge/btc/ {
+		proxy_pass http://clightning_bitcoin_charge:9112/;
 	}
 		{{ end }}
 	{{ end }}
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index da0b152..c920bf5 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -27,6 +27,20 @@ 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
+      CHARGE_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}ligthning-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
@@ -45,11 +59,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:-/}ligthning-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:
\ No newline at end of file
+  clightning_bitcoin_spark:
+  clightning_bitcoin_charge:
diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index 4db082d..cba6db0 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.33}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.34}
     expose:
       - "49392"
     environment:

From 5273df887bbfbbf4b7311dc4b91d5f4c78e66c05 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 21 Dec 2018 17:35:40 +0900
Subject: [PATCH 09/16] SIGKILL LND containers

---
 docker-compose-generator/docker-fragments/bitcoin-lnd.yml  | 1 +
 docker-compose-generator/docker-fragments/litecoin-lnd.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index 327d171..75d9b81 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/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:
diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
index dc949a3..b517c25 100644
--- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml
+++ b/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:

From 8356e6a93a54d8afd5d911b9f35ff3e929e0bb26 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Sat, 22 Dec 2018 00:07:31 +0900
Subject: [PATCH 10/16] Fix typo in lightning charge path

---
 .../docker-fragments/bitcoin-clightning.yml                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index c920bf5..e5ad25e 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -33,7 +33,7 @@ services:
     environment:
       NETWORK: ${NBITCOIN_NETWORK:-regtest}
       COOKIE_FILE: /data/.cookie
-      CHARGE_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}ligthning-charge/btc/
+      CHARGE_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}lightning-charge/btc/
     volumes:
       - "clightning_bitcoin_datadir:/etc/lightning"
       - "clightning_bitcoin_charge:/data"
@@ -59,7 +59,7 @@ 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:-/}ligthning-charge/btc/;cookiefilepath=/etc/clightning_bitcoin_charge/.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"

From ca3a314397eb266aff67d50833092b7d780eddf3 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Sat, 22 Dec 2018 00:12:38 +0900
Subject: [PATCH 11/16] Fix URL charge

---
 .../docker-fragments/bitcoin-clightning.yml                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index e5ad25e..04dff5f 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -33,7 +33,7 @@ services:
     environment:
       NETWORK: ${NBITCOIN_NETWORK:-regtest}
       COOKIE_FILE: /data/.cookie
-      CHARGE_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}lightning-charge/btc/
+      URL: {BTCPAY_ROOTPATH:-/}lightning-charge/btc/
     volumes:
       - "clightning_bitcoin_datadir:/etc/lightning"
       - "clightning_bitcoin_charge:/data"

From 67a16c42a0112a32a79b516f3174e364ed86e3b9 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Sat, 22 Dec 2018 00:13:03 +0900
Subject: [PATCH 12/16] Fix URL charge

---
 .../docker-fragments/bitcoin-clightning.yml                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 04dff5f..5b83c30 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -33,7 +33,7 @@ services:
     environment:
       NETWORK: ${NBITCOIN_NETWORK:-regtest}
       COOKIE_FILE: /data/.cookie
-      URL: {BTCPAY_ROOTPATH:-/}lightning-charge/btc/
+      URL: ${BTCPAY_ROOTPATH:-/}lightning-charge/btc/
     volumes:
       - "clightning_bitcoin_datadir:/etc/lightning"
       - "clightning_bitcoin_charge:/data"

From 6238f11fa2db78803c3d5d1eaca2761256fdbca5 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Sat, 22 Dec 2018 00:19:50 +0900
Subject: [PATCH 13/16] fix typo for charge

---
 Production/nginx.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index aeeb5a6..05bb2af 100644
--- a/Production/nginx.tmpl
+++ b/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")) }}
 
@@ -324,7 +323,7 @@ server {
 	}
 		{{ end }}
 		{{ if (eq $serviceName "clightning_bitcoin_charge") }}
-	location /ligthning-charge/btc/ {
+	location /lightning-charge/btc/ {
 		proxy_pass http://clightning_bitcoin_charge:9112/;
 	}
 		{{ end }}

From dcf7c8264dd8310c664ad1f70eea607dd20dba7e Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Tue, 25 Dec 2018 15:12:00 +0900
Subject: [PATCH 14/16] bump spark

---
 .../docker-fragments/bitcoin-clightning.yml                    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 5b83c30..adce83d 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -42,8 +42,7 @@ services:
     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}

From d82b397ee1343ea352b0cfd72ea30e896af8c5f6 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 26 Dec 2018 15:14:47 +0900
Subject: [PATCH 15/16] bump

---
 docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index cba6db0..ed9b6ca 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.34}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.35}
     expose:
       - "49392"
     environment:

From 00d233ee900be266faf68b6b28dafd87048abd82 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 27 Dec 2018 18:55:36 +0900
Subject: [PATCH 16/16] bump

---
 docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index ed9b6ca..89d6332 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.35}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.36}
     expose:
       - "49392"
     environment: