From 595c997c852f812e75253d4d264a1eb8207b5aab Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Tue, 4 Dec 2018 19:03:01 +0900
Subject: [PATCH 01/16] update lnd

---
 contrib/DockerFileBuildHelper/Program.cs      |  5 ++--
 contrib/build-all-images.sh                   | 24 +++++++++++--------
 .../docker-fragments/bitcoin-lnd.yml          |  2 +-
 .../docker-fragments/litecoin-lnd.yml         |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index 066af1b..cf5759f 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -181,9 +181,10 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitRef = $"basedon-{image.Tag}";
                     break;
                 case "lnd":
-                    dockerInfo.DockerFilePath = "BTCPayServer.Dockerfile";
+                    dockerInfo.DockerFilePath = "linuxamd64.Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = "linuxarm32v7.Dockerfile";
                     dockerInfo.GitLink = "https://github.com/btcpayserver/lnd";
-                    dockerInfo.GitRef = $"basedon-v{image.Tag}";
+                    dockerInfo.GitRef = $"basedon-{image.Tag}";
                     break;
                 case "bitcoin":
                     dockerInfo.DockerFilePath = $"Bitcoin/{image.Tag}/linuxamd64.Dockerfile";
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index 84d729d..344f77d 100755
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -71,14 +71,16 @@ cd - && cd ..
 
 
 # Build lnd
-# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-2/BTCPayServer.Dockerfile
-DOCKERFILE="BTCPayServer.Dockerfile"
-echo "Building btcpayserver/lnd:0.5-beta-2"
+# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxamd64.Dockerfile
+DOCKERFILE="linuxamd64.Dockerfile"
+# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxarm32v7.Dockerfile
+[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
+echo "Building btcpayserver/lnd:v0.5-beta-3"
 git clone https://github.com/btcpayserver/lnd lnd
 cd lnd
-git checkout basedon-v0.5-beta-2
+git checkout basedon-v0.5-beta-3
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:0.5-beta-2" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5-beta-3" .
 cd - && cd ..
 
 
@@ -189,14 +191,16 @@ cd - && cd ..
 
 
 # Build lnd
-# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-2/BTCPayServer.Dockerfile
-DOCKERFILE="BTCPayServer.Dockerfile"
-echo "Building btcpayserver/lnd:0.5-beta-2"
+# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxamd64.Dockerfile
+DOCKERFILE="linuxamd64.Dockerfile"
+# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxarm32v7.Dockerfile
+[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
+echo "Building btcpayserver/lnd:v0.5-beta-3"
 git clone https://github.com/btcpayserver/lnd lnd
 cd lnd
-git checkout basedon-v0.5-beta-2
+git checkout basedon-v0.5-beta-3
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:0.5-beta-2" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5-beta-3" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index dc38442..432eeb9 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:0.5-beta-2
+    image: btcpayserver/lnd:v0.5-beta-3
     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 ced78bd..8f88c5a 100644
--- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   lnd_litecoin:
-    image: btcpayserver/lnd:0.5-beta-2
+    image: btcpayserver/lnd:v0.5-beta-3
     container_name: btcpayserver_lnd_litecoin
     restart: unless-stopped
     environment:

From 9d218107a44519bf0555e1cd8006bf6729dbc3b6 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 5 Dec 2018 15:53:46 +0900
Subject: [PATCH 02/16] Fix indentation in nginx

---
 Production/nginx.tmpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 84ffaf5..e5bc097 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -301,13 +301,13 @@ server {
 	{{ range $container := $ }}
 		{{ $serviceName := (index $container.Labels "com.docker.compose.service") }}
 		{{ if (eq $serviceName "lnd_bitcoin") }}
-				location /lnrpc.Lightning {
-					grpc_pass grpcs://lnd_bitcoin:10009;
-				}
-				location /lnd-rest/btc/ {
-					rewrite ^/lnd-rest/btc/(.*) /$1 break;
-					proxy_pass http://lnd_bitcoin:8080/;
-				}
+	location /lnrpc.Lightning {
+		grpc_pass grpcs://lnd_bitcoin:10009;
+	}
+	location /lnd-rest/btc/ {
+		rewrite ^/lnd-rest/btc/(.*) /$1 break;
+		proxy_pass http://lnd_bitcoin:8080/;
+	}
 		{{ end }}
 	{{ end }}
 }

From def3ce7fb59398762b0eb49af20a98491755d8fb Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 5 Dec 2018 16:29:45 +0900
Subject: [PATCH 03/16] Add btcqbo

---
 Production/nginx.tmpl | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index e5bc097..147820b 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -310,6 +310,19 @@ server {
 	}
 		{{ end }}
 	{{ end }}
+
+	{{ range $container := $ }}
+		{{ $serviceName := (index $container.Labels "com.docker.compose.service") }}
+		{{ if (eq $serviceName "btcqbo") }}
+	location /btcqbo/ {
+		proxy_pass http://btcqbo:8001;
+		proxy_redirect off;
+		proxy_set_header Host $host;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	}
+		{{ end }}
+	{{ end }}
 }
 
 {{ end }}

From 843e87a4f252a77f53fab6ba71cb2e6a4052a716 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 5 Dec 2018 16:30:30 +0900
Subject: [PATCH 04/16] Add btcqbo

---
 .../docker-fragments/opt-add-btcqbo.yml                    | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 docker-compose-generator/docker-fragments/opt-add-btcqbo.yml

diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
new file mode 100644
index 0000000..493ab84
--- /dev/null
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -0,0 +1,7 @@
+version: "3"
+
+services:
+  btcqbo:
+    image: jvandrew/btcqbo:0.1.0
+    expose:
+      - "8001"
\ No newline at end of file

From 1dfece6410b1d904d52acc988fc142c452934214 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 5 Dec 2018 16:42:28 +0900
Subject: [PATCH 05/16] fix qbo

---
 .../docker-fragments/opt-add-btcqbo.yml            | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
index 493ab84..0826738 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -3,5 +3,17 @@ version: "3"
 services:
   btcqbo:
     image: jvandrew/btcqbo:0.1.0
+    environment:
+      REDIS_URL: "redis://redis:6379/0"
     expose:
-      - "8001"
\ No newline at end of file
+      - "8001"
+  rq-worker:
+    image: jvandrew/btcqbo:0.1.0
+    entrypoint: /usr/local/bin/rq
+    command: worker -u redis://redis:6379/0 btcqbo
+    environment:
+      REDIS_URL: "redis://redis:6379/0"
+    expose:
+      - "8001"
+  redis:
+    image: redis:5.0.2-alpine
\ No newline at end of file

From 0622bc213b10e54c31816df72532e3215f151292 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 5 Dec 2018 16:54:53 +0900
Subject: [PATCH 06/16] persist redis

---
 .../docker-fragments/opt-add-btcqbo.yml                    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
index 0826738..6d235c9 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -16,4 +16,9 @@ services:
     expose:
       - "8001"
   redis:
-    image: redis:5.0.2-alpine
\ No newline at end of file
+    image: redis:5.0.2-alpine
+    volumes:
+      - "redis_datadir:/data"
+
+volumes:
+    redis_datadir:
\ No newline at end of file

From 073a20e76bd7a3797fbebdb429b8abaa5244e56d Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 5 Dec 2018 17:03:17 +0900
Subject: [PATCH 07/16] Add link and expose redis port

---
 .../docker-fragments/opt-add-btcqbo.yml                     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
index 6d235c9..7cc1519 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -7,6 +7,8 @@ services:
       REDIS_URL: "redis://redis:6379/0"
     expose:
       - "8001"
+    link: 
+      - redis
   rq-worker:
     image: jvandrew/btcqbo:0.1.0
     entrypoint: /usr/local/bin/rq
@@ -15,8 +17,12 @@ services:
       REDIS_URL: "redis://redis:6379/0"
     expose:
       - "8001"
+    link: 
+      - redis
   redis:
     image: redis:5.0.2-alpine
+    expose:
+      - "6379"
     volumes:
       - "redis_datadir:/data"
 

From 7c602e6cca1bd9826a5bec06593c949f170d1cbe Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 5 Dec 2018 17:03:48 +0900
Subject: [PATCH 08/16] Fix typo

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

diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
index 7cc1519..2d3876b 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -7,7 +7,7 @@ services:
       REDIS_URL: "redis://redis:6379/0"
     expose:
       - "8001"
-    link: 
+    links: 
       - redis
   rq-worker:
     image: jvandrew/btcqbo:0.1.0
@@ -17,7 +17,7 @@ services:
       REDIS_URL: "redis://redis:6379/0"
     expose:
       - "8001"
-    link: 
+    links: 
       - redis
   redis:
     image: redis:5.0.2-alpine

From fac673241a91a653f2a62d3199eb4d4caf432f16 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 11:08:23 +0900
Subject: [PATCH 09/16] Pass btcpay host to btcqbo

---
 docker-compose-generator/docker-fragments/opt-add-btcqbo.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
index 2d3876b..6278902 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -5,12 +5,14 @@ services:
     image: jvandrew/btcqbo:0.1.0
     environment:
       REDIS_URL: "redis://redis:6379/0"
+      BTCPAY_HOST: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}
+      CALLBACK_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/btcqbo/qbologged
     expose:
       - "8001"
     links: 
       - redis
   rq-worker:
-    image: jvandrew/btcqbo:0.1.0
+    image: jvandrew/btcqbo:0.1.1
     entrypoint: /usr/local/bin/rq
     command: worker -u redis://redis:6379/0 btcqbo
     environment:

From 9e1ff53ab26afd10e35cdf54fb4d039500044c05 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 11:10:29 +0900
Subject: [PATCH 10/16] bump btcqbo

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

diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
index 6278902..a862a79 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   btcqbo:
-    image: jvandrew/btcqbo:0.1.0
+    image: jvandrew/btcqbo:0.1.1
     environment:
       REDIS_URL: "redis://redis:6379/0"
       BTCPAY_HOST: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}

From 4243f1bf88b498f56d078e2d0f6adc244bb7a74c Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 12:32:49 +0900
Subject: [PATCH 11/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 9309a8b..f9ad7cc 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.23}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.24}
     expose:
       - "49392"
     environment:

From 1991c499a691a6d5aacd63b6bc808fc0f8bfea04 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 14:30:43 +0900
Subject: [PATCH 12/16] Error if the user did not run sudo su -

---
 btcpay-setup.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/btcpay-setup.sh b/btcpay-setup.sh
index 776faae..7af3133 100755
--- a/btcpay-setup.sh
+++ b/btcpay-setup.sh
@@ -70,6 +70,15 @@ if [ "$1" != "-i" ]; then
     return
 fi
 
+if [ -z "$BTCPAY_HOST" ]; then
+    if [ -f "/etc/profile.d/btcpay-env.sh" ]; then
+        echo "This script must be run as root after running \"sudo su -\""
+    else
+        echo "BTCPAY_HOST should not be empty"
+    fi
+    return
+fi
+
 ######### Migration: old pregen environment to new environment ############
 if [ ! -z $BTCPAY_DOCKER_COMPOSE ] && [ ! -z $DOWNLOAD_ROOT ] && [ -z $BTCPAYGEN_OLD_PREGEN ]; then 
     echo "Your deployment is too old, you need to migrate by following instructions on this link https://github.com/btcpayserver/btcpayserver-docker/tree/master#i-deployed-before-btcpay-setupsh-existed-before-may-17-can-i-migrate-to-this-new-system"
@@ -157,11 +166,6 @@ BTCPAY_SSHTRUSTEDFINGERPRINTS:$BTCPAY_SSHTRUSTEDFINGERPRINTS
 ----------------------
 "
 
-if [ -z "$BTCPAY_HOST" ]; then
-    echo "BTCPAY_HOST should not be empty"
-    return
-fi
-
 if [ -z "$BTCPAYGEN_CRYPTO1" ]; then
     echo "BTCPAYGEN_CRYPTO1 should not be empty"
     return

From 4e7c84b690b1c6fc71d58f6a8688d17a4ae66b78 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 14:54:49 +0900
Subject: [PATCH 13/16] Add image info for redis and btcqbo

---
 contrib/DockerFileBuildHelper/Program.cs | 10 ++++++
 contrib/build-all-images.sh              | 46 +++++++++++++++++++++---
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index cf5759f..01f6a41 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -264,6 +264,16 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitLink = "https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion";
                     dockerInfo.GitRef = $"v{image.Tag}";
                     break;
+                case "btcqbo":
+                    dockerInfo.DockerFilePath = $"Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/JeffVandrewJr/btcqbo";
+                    dockerInfo.GitRef = $"v{image.Tag}";
+                    break;
+                case "redis":
+                    dockerInfo.DockerFilePath = $"5.0/Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/docker-library/redis";
+                    dockerInfo.GitRef = $"f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c";
+                    break;
                 case "postgres":
                     dockerInfo.DockerFilePath = $"9.6/Dockerfile";
                     dockerInfo.DockerFilePathARM32v7 = $"9.6/Dockerfile";
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index 344f77d..ffc69d5 100755
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -113,16 +113,16 @@ cd - && cd ..
 
 
 # Build btcpayserver
-# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.23/Dockerfile.linuxamd64
+# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.24/Dockerfile.linuxamd64
 DOCKERFILE="Dockerfile.linuxamd64"
-# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.23/Dockerfile.linuxarm32v7
+# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.24/Dockerfile.linuxarm32v7
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7"
-echo "Building btcpayserver/btcpayserver:1.0.3.23"
+echo "Building btcpayserver/btcpayserver:1.0.3.24"
 git clone https://github.com/btcpayserver/btcpayserver btcpayserver
 cd btcpayserver
-git checkout v1.0.3.23
+git checkout v1.0.3.24
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.23" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.24" .
 cd - && cd ..
 
 
@@ -282,6 +282,42 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/letsencrypt-nginx-proxy-companion
 cd - && cd ..
 
 
+# Build btcqbo
+# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.1/Dockerfile
+DOCKERFILE="Dockerfile"
+echo "Building jvandrew/btcqbo:0.1.1"
+git clone https://github.com/JeffVandrewJr/btcqbo btcqbo
+cd btcqbo
+git checkout v0.1.1
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.1" .
+cd - && cd ..
+
+
+# Build btcqbo
+# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.1/Dockerfile
+DOCKERFILE="Dockerfile"
+echo "Building jvandrew/btcqbo:0.1.1"
+git clone https://github.com/JeffVandrewJr/btcqbo btcqbo
+cd btcqbo
+git checkout v0.1.1
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.1" .
+cd - && cd ..
+
+
+# Build redis
+# https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile
+DOCKERFILE="5.0/Dockerfile"
+echo "Building redis:5.0.2-alpine"
+git clone https://github.com/docker-library/redis redis
+cd redis
+git checkout f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "redis:5.0.2-alpine" .
+cd - && cd ..
+
+
 # Build postgres
 # https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile
 DOCKERFILE="9.6/Dockerfile"

From e0820bdc40537a47ae854c230d4e90367478adeb Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 14:58:58 +0900
Subject: [PATCH 14/16] fix documentation

---
 README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index cf572f1..0351a8b 100644
--- a/README.md
+++ b/README.md
@@ -227,13 +227,7 @@ export BTCPAY_BASE_DIRECTORY="/var/lib/waagent/custom-script/download/0"
 export BTCPAY_ENV_FILE="/var/lib/waagent/custom-script/download/0/.env"
 export BTCPAY_HOST_SSHKEYFILE="/root/.ssh/id_rsa_btcpay"
 if cat $BTCPAY_ENV_FILE &> /dev/null; then
-export BTCPAY_HOST="$(cat $BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_HOST=\(.*\)$/\1/p')"
-export LETSENCRYPT_EMAIL="$(cat $BTCPAY_ENV_FILE | sed -n 's/^LETSENCRYPT_EMAIL=\(.*\)$/\1/p')"
-export NBITCOIN_NETWORK="$(cat $BTCPAY_ENV_FILE | sed -n 's/^NBITCOIN_NETWORK=\(.*\)$/\1/p')"
-export LIGHTNING_ALIAS="$(cat $BTCPAY_ENV_FILE | sed -n 's/^LIGHTNING_ALIAS=\(.*\)$/\1/p')"
-export ACME_CA_URI="$(cat $BTCPAY_ENV_FILE | sed -n 's/^ACME_CA_URI=\(.*\)$/\1/p')"
-export BTCPAY_SSHKEYFILE="$(cat $BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_SSHKEYFILE=\(.*\)$/\1/p')"
-export BTCPAY_SSHTRUSTEDFINGERPRINTS="$(cat $BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_SSHTRUSTEDFINGERPRINTS=\(.*\)$/\1/p')"
+export $(grep -v '^#' "$BTCPAY_ENV_FILE" | xargs)
 fi
 ```
 

From c35bd6e7f447794b520e45f8e1d70f4b50fee89d Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 14:59:21 +0900
Subject: [PATCH 15/16] fix documentation

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

diff --git a/README.md b/README.md
index 0351a8b..fac68e0 100644
--- a/README.md
+++ b/README.md
@@ -227,7 +227,7 @@ export BTCPAY_BASE_DIRECTORY="/var/lib/waagent/custom-script/download/0"
 export BTCPAY_ENV_FILE="/var/lib/waagent/custom-script/download/0/.env"
 export BTCPAY_HOST_SSHKEYFILE="/root/.ssh/id_rsa_btcpay"
 if cat $BTCPAY_ENV_FILE &> /dev/null; then
-export $(grep -v '^#' "$BTCPAY_ENV_FILE" | xargs)
+  export $(grep -v '^#' "$BTCPAY_ENV_FILE" | xargs)
 fi
 ```
 

From cb04453d93255f06f7bcd54cd7dfdfb2e66b1d31 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 6 Dec 2018 17:32:10 +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 f9ad7cc..59790ce 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.24}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.25}
     expose:
       - "49392"
     environment: