From 58ab26b58b7215741695aadd548ccfafeadc6421 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Tue, 11 Oct 2022 23:32:08 +0900
Subject: [PATCH 01/20] bump nbx

---
 README.md                                            |  2 +-
 contrib/build-all-images.sh                          | 12 ++++++------
 .../docker-fragments/nbxplorer.yml                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a8306e7..7bc3c3c 100644
--- a/README.md
+++ b/README.md
@@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | btcpayserver/bitcoin | 23.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) |
 | btcpayserver/btcpayserver | 1.6.12$<BTCPAY_BUILD_CONFIGURATION>? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
 | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) |
-| nicolasdorier/nbxplorer | 2.3.38 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.38/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.38/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.38/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
+| nicolasdorier/nbxplorer | 2.3.39 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
 | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) |
 | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) |
 | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index 8269f1a..acbfe92 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -480,18 +480,18 @@ cd - && cd ..
 
 
 # Build nbxplorer
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.38/Dockerfile.linuxamd64
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxamd64
 DOCKERFILE="Dockerfile.linuxamd64"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.38/Dockerfile.linuxarm32v7
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm32v7
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.38/Dockerfile.linuxarm64v8
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm64v8
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8"
-echo "Building nicolasdorier/nbxplorer:2.3.38"
+echo "Building nicolasdorier/nbxplorer:2.3.39"
 git clone https://github.com/dgarage/nbxplorer nbxplorer
 cd nbxplorer
-git checkout v2.3.38
+git checkout v2.3.39
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.38" .
+docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.39" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml
index 90965f4..0c4cc61 100644
--- a/docker-compose-generator/docker-fragments/nbxplorer.yml
+++ b/docker-compose-generator/docker-fragments/nbxplorer.yml
@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.3.38
+    image: nicolasdorier/nbxplorer:2.3.39
     expose:
       - "32838"
     environment:

From 110c1caa01462b697e754e32810d0cf527c128da Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Mon, 30 Aug 2021 14:41:43 +0200
Subject: [PATCH 02/20] Add Mempool Explorer

---
 Production/nginx.tmpl                         | 41 ++++++++++-
 .../docker-fragments/opt-add-electrumx.yml    |  3 +-
 .../docker-fragments/opt-add-mempool.yml      | 68 +++++++++++++++++++
 3 files changed, 108 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose-generator/docker-fragments/opt-add-mempool.yml

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index d8db563..3f7c69a 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -191,8 +191,8 @@
         proxy_set_header        X-Forwarded-Proto  https;
 		proxy_pass http://configurator;
 	}
-		{{ end }}
-		{{ if (eq $serviceName "nnostr-relay") }}
+  {{ end }}
+  {{ if (eq $serviceName "nnostr-relay") }}
 	location /nostr/ {
 		proxy_set_header Connection "";
 		proxy_set_header        Host               $host;
@@ -207,7 +207,42 @@
     	proxy_set_header Connection "Upgrade";
 		proxy_pass http://nnostr-relay;
 	}
-		{{ end }}
+  {{ end }}
+  {{ if (eq $serviceName "mempool_web") }}
+	location /mempool/ {
+		proxy_pass http://mempool_web:8080;
+
+		# static API docs
+		location = /api {
+			try_files $uri $uri/ /en-US/index.html =404;
+		}
+		location = /api/ {
+			try_files $uri $uri/ /en-US/index.html =404;
+		}
+
+		# mainnet API
+		location /api/v1/ws {
+			proxy_pass http://mempool_api:8999/;
+			proxy_http_version 1.1;
+			proxy_set_header Upgrade $http_upgrade;
+			proxy_set_header Connection "Upgrade";
+		}
+		location /api/v1 {
+			proxy_pass http://mempool_api:8999/api/v1;
+		}
+		location /api/ {
+			proxy_pass http://mempool_api:8999/api/v1/;
+		}
+
+		# mainnet API
+		location /ws {
+			proxy_pass http://mempool_api:8999/;
+			proxy_http_version 1.1;
+			proxy_set_header Upgrade $http_upgrade;
+			proxy_set_header Connection "Upgrade";
+		}
+	}
+	{{ end }}
 	{{ end }}
 	{{ end }}
 
diff --git a/docker-compose-generator/docker-fragments/opt-add-electrumx.yml b/docker-compose-generator/docker-fragments/opt-add-electrumx.yml
index 3bddd6c..e92d392 100644
--- a/docker-compose-generator/docker-fragments/opt-add-electrumx.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-electrumx.yml
@@ -4,7 +4,6 @@ services:
   bitcoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        txindex=1
         rpcauth=electrumx:7d8ee47c089e6072635f82b34796e878$$13649d99453ccdf78e85007286422599c00e6953289f41bf8e92961076ba14db
   electrumx:
     image: lukechilds/electrumx
@@ -20,3 +19,5 @@ volumes:
   electrumx_datadir:
 incompatible:
   - pruning
+required:
+  - "opt-txindex"
\ No newline at end of file
diff --git a/docker-compose-generator/docker-fragments/opt-add-mempool.yml b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
new file mode 100644
index 0000000..1830a61
--- /dev/null
+++ b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
@@ -0,0 +1,68 @@
+version: '3'
+
+services:
+  bitcoind:
+    environment:
+      BITCOIN_EXTRA_ARGS: |
+        rpcauth=mempool:d77ee0acf132038f6aaa9d4500d745ec$72cc78dcf18191c91d10c15ff8f7c3dbbd170c4d3107cca35d71c6bf96af2ed9
+  mempool_web:
+    image: mempool/frontend:latest
+    restart: on-failure
+    stop_grace_period: 1m
+    command: "./wait-for mempool_db:3306 --timeout=720 -- nginx -g 'daemon off;'"
+    expose:
+      - "8080"
+    environment:
+      FRONTEND_HTTP_PORT: "8080"
+      BACKEND_MAINNET_HTTP_HOST: "mempool_api"
+
+  mempool_api:
+    image: mempool/backend:latest
+    restart: on-failure
+    stop_grace_period: 1m
+    command: "./wait-for-it.sh db:3306 --timeout=720 --strict -- ./start.sh"
+    volumes:
+      - mempool_api_datadir:/backend/cache
+    environment:
+      RPC_HOST: "bitcoind"
+      RPC_PORT: "43782"
+      RPC_USER: "mempool"
+      RPC_PASS: "mempool"
+      ELECTRUM_HOST: "electrumx"
+      ELECTRUM_PORT: "50002"
+      ELECTRUM_TLS: "false"
+      MYSQL_HOST: "mempool_db"
+      MYSQL_PORT: "3306"
+      MYSQL_DATABASE: "mempool"
+      MYSQL_USER: "mempool"
+      MYSQL_PASS: "mempool"
+      BACKEND_MAINNET_HTTP_PORT: "8999"
+      CACHE_DIR: "/backend/cache"
+      MEMPOOL_CLEAR_PROTECTION_MINUTES: "20"
+
+  mempool_db:
+    image: mariadb:10.5.8
+    restart: on-failure    
+    expose:
+      - "3306"
+    volumes:
+      - "mempool_db_datadir:/var/lib/mysql"
+      - ./mysql/db-scripts:/docker-entrypoint-initdb.d
+    environment:
+      MYSQL_DATABASE: "mempool"
+      MYSQL_USER: "mempool"
+      MYSQL_PASSWORD: "mempool"
+      MYSQL_ROOT_PASSWORD: "admin"
+
+  btcpayserver:
+    environment:
+      BTCPAY_EXTERNALSERVICES: "Mempool Explorer:/mempool-explorer"
+volumes:
+  - mempool_db_datadir:
+  - mempool_api_datadir:
+
+required:
+  - opt-add-electrumx
+  - opt-txindex
+incompatible:
+  - pruning

From b3701ebad3da2b4cca43efef50187334fee7ed55 Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Sat, 10 Sep 2022 13:30:15 +0200
Subject: [PATCH 03/20] Update mempool fragment

---
 Production/nginx.tmpl                         | 18 +++++---
 .../docker-fragments/opt-add-mempool.yml      | 46 ++++++++++---------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 3f7c69a..f00f37e 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -209,33 +209,39 @@
 	}
   {{ end }}
   {{ if (eq $serviceName "mempool_web") }}
+  # https://github.com/mempool/mempool/tree/master/production/nginx
 	location /mempool/ {
 		proxy_pass http://mempool_web:8080;
 
+		sub_filter_types *;
+		sub_filter_once off;
+		sub_filter 'base href="/'  'base href="/mempool/';
+		sub_filter '="/resources'  '="/mempool/resources';
+
 		# static API docs
-		location = /api {
+		location = /mempool/api {
 			try_files $uri $uri/ /en-US/index.html =404;
 		}
-		location = /api/ {
+		location = /mempool/api/ {
 			try_files $uri $uri/ /en-US/index.html =404;
 		}
 
 		# mainnet API
-		location /api/v1/ws {
+		location /mempool/api/v1/ws {
 			proxy_pass http://mempool_api:8999/;
 			proxy_http_version 1.1;
 			proxy_set_header Upgrade $http_upgrade;
 			proxy_set_header Connection "Upgrade";
 		}
-		location /api/v1 {
+		location /mempool/api/v1 {
 			proxy_pass http://mempool_api:8999/api/v1;
 		}
-		location /api/ {
+		location /mempool/api/ {
 			proxy_pass http://mempool_api:8999/api/v1/;
 		}
 
 		# mainnet API
-		location /ws {
+		location /mempool/ws {
 			proxy_pass http://mempool_api:8999/;
 			proxy_http_version 1.1;
 			proxy_set_header Upgrade $http_upgrade;
diff --git a/docker-compose-generator/docker-fragments/opt-add-mempool.yml b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
index 1830a61..9ecc423 100644
--- a/docker-compose-generator/docker-fragments/opt-add-mempool.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
@@ -1,10 +1,14 @@
 version: '3'
 
+# reference: https://github.com/mempool/mempool/blob/master/docker/docker-compose.yml
 services:
   bitcoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        rpcauth=mempool:d77ee0acf132038f6aaa9d4500d745ec$72cc78dcf18191c91d10c15ff8f7c3dbbd170c4d3107cca35d71c6bf96af2ed9
+        # We need to use rpcauth because we also need cookieauth. rpcpassword disabled cookie file auth.
+        # Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped.
+        rpcauth=mempool:d77ee0acf132038f6aaa9d4500d745ec$$72cc78dcf18191c91d10c15ff8f7c3dbbd170c4d3107cca35d71c6bf96af2ed9
+
   mempool_web:
     image: mempool/frontend:latest
     restart: on-failure
@@ -20,34 +24,31 @@ services:
     image: mempool/backend:latest
     restart: on-failure
     stop_grace_period: 1m
-    command: "./wait-for-it.sh db:3306 --timeout=720 --strict -- ./start.sh"
+    command: "./wait-for-it.sh mempool_db:3306 --timeout=720 --strict -- ./start.sh"
     volumes:
       - mempool_api_datadir:/backend/cache
     environment:
-      RPC_HOST: "bitcoind"
-      RPC_PORT: "43782"
-      RPC_USER: "mempool"
-      RPC_PASS: "mempool"
+      MEMPOOL_BACKEND: "electrum"
       ELECTRUM_HOST: "electrumx"
       ELECTRUM_PORT: "50002"
-      ELECTRUM_TLS: "false"
-      MYSQL_HOST: "mempool_db"
-      MYSQL_PORT: "3306"
-      MYSQL_DATABASE: "mempool"
-      MYSQL_USER: "mempool"
-      MYSQL_PASS: "mempool"
-      BACKEND_MAINNET_HTTP_PORT: "8999"
-      CACHE_DIR: "/backend/cache"
-      MEMPOOL_CLEAR_PROTECTION_MINUTES: "20"
+      ELECTRUM_TLS_ENABLED: "false"
+      CORE_RPC_HOST: "bitcoind"
+      CORE_RPC_PORT: "43782"
+      CORE_RPC_USERNAME: "mempool"
+      CORE_RPC_PASSWORD: "mempool"
+      DATABASE_ENABLED: "true"
+      DATABASE_HOST: "mempool_db"
+      DATABASE_DATABASE: "mempool"
+      DATABASE_USERNAME: "mempool"
+      DATABASE_PASSWORD: "mempool"
 
   mempool_db:
     image: mariadb:10.5.8
-    restart: on-failure    
+    restart: on-failure
     expose:
       - "3306"
     volumes:
       - "mempool_db_datadir:/var/lib/mysql"
-      - ./mysql/db-scripts:/docker-entrypoint-initdb.d
     environment:
       MYSQL_DATABASE: "mempool"
       MYSQL_USER: "mempool"
@@ -56,13 +57,14 @@ services:
 
   btcpayserver:
     environment:
-      BTCPAY_EXTERNALSERVICES: "Mempool Explorer:/mempool-explorer"
+      BTCPAY_EXTERNALSERVICES: "Mempool Explorer:/mempool"
+
 volumes:
-  - mempool_db_datadir:
-  - mempool_api_datadir:
+  mempool_db_datadir:
+  mempool_api_datadir:
 
 required:
-  - opt-add-electrumx
-  - opt-txindex
+  - "opt-add-electrumx"
+
 incompatible:
   - pruning

From 831d7a561b03b5ec6c14244d70b8714dc0d58e66 Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Tue, 11 Oct 2022 16:08:43 +0200
Subject: [PATCH 04/20] Final updates

---
 Production/nginx.tmpl                         | 38 +++++++++----------
 README.md                                     |  6 ++-
 contrib/DockerFileBuildHelper/Program.cs      |  8 ++++
 contrib/build-all-images.sh                   | 16 ++++++--
 .../docker-fragments/opt-add-electrumx.yml    |  4 +-
 .../docker-fragments/opt-add-mempool.yml      | 10 +++--
 6 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index f00f37e..90fbfce 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -211,42 +211,38 @@
   {{ if (eq $serviceName "mempool_web") }}
   # https://github.com/mempool/mempool/tree/master/production/nginx
 	location /mempool/ {
-		proxy_pass http://mempool_web:8080;
+		proxy_pass http://mempool_web:8080/;
+
+		# Bypass gzip, so that we can apply sub_filter, which does not work with proxy compressed response.
+		# Details: https://www.nginx.com/resources/wiki/modules/substitutions/#directives
+		proxy_set_header Accept-Encoding "";
 
 		sub_filter_types *;
 		sub_filter_once off;
-		sub_filter 'base href="/'  'base href="/mempool/';
-		sub_filter '="/resources'  '="/mempool/resources';
 
-		# static API docs
-		location = /mempool/api {
-			try_files $uri $uri/ /en-US/index.html =404;
-		}
-		location = /mempool/api/ {
-			try_files $uri $uri/ /en-US/index.html =404;
-		}
+		sub_filter 'base href="/'           'base href="/mempool/';
+		sub_filter '/api/v1/'               '/mempool/api/v1/';
+		sub_filter '/resources'             '/mempool/resources';
+
+		proxy_set_header Accept-Encoding "";
+		proxy_pass http://mempool_web:8080/;
 
 		# mainnet API
 		location /mempool/api/v1/ws {
-			proxy_pass http://mempool_api:8999/;
+			proxy_pass http://mempool_api:8999;
 			proxy_http_version 1.1;
 			proxy_set_header Upgrade $http_upgrade;
 			proxy_set_header Connection "Upgrade";
 		}
-		location /mempool/api/v1 {
-			proxy_pass http://mempool_api:8999/api/v1;
+		location /mempool/api/v1/ {
+			proxy_pass http://mempool_api:8999/api/v1/;
 		}
 		location /mempool/api/ {
 			proxy_pass http://mempool_api:8999/api/v1/;
 		}
-
-		# mainnet API
-		location /mempool/ws {
-			proxy_pass http://mempool_api:8999/;
-			proxy_http_version 1.1;
-			proxy_set_header Upgrade $http_upgrade;
-			proxy_set_header Connection "Upgrade";
-		}
+	}
+	location ~ "^/[a-z]{2}/mempool" {
+		rewrite ^/(.*)/mempool $scheme://$server_name/mempool/$1/ redirect;
 	}
 	{{ end }}
 	{{ end }}
diff --git a/README.md b/README.md
index 7bc3c3c..5181b51 100644
--- a/README.md
+++ b/README.md
@@ -172,14 +172,15 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are:
 * [opt-txindex](docker-compose-generator/docker-fragments/opt-txindex.yml), to enable txindex=1 in bitcoin.conf if you require txindexing for Bisq, DOJO, etc.
 * [opt-expose-unsafe](docker-compose-generator/docker-fragments/opt-expose-unsafe.yml), to unsafely expose bitcoind P2P port 8333 if you require P2P for Bisq, DOJO, Esplora, etc. WARNING: ONLY USE ON TRUSTED LAN OR WITH FIREWALL RULES WHITELISTING SPECIFIC HOSTS
 * [opt-add-tor-relay](docker-compose-generator/docker-fragments/opt-add-tor-relay.yml), for a non-exit tor relay. Make sure to have ports 9001 and 9030 accessible externally. [Please read the legal implications of running a tor relay](https://community.torproject.org/relay/community-resources/eff-tor-legal-faq) and [what resources are used to operate the relay](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide#RelayRequirements).
-* [opt-add-electrumx](docker-compose-generator/docker-fragments/opt-add-electrumx.yml), to integrate a full ElectrumX server (from official source) with BTCPay, using the BTCPay server's full bitcoin node for complete privacy when using your own Electrum wallet.  You can also open port 50002 up to the internet on your router etc, to be part of the ElectrumX network, helping other Electrum wallet users to get connected. The bitcoin option `-txindex` is mandatory for ElectrumX, and this fragment will enable it on your BTCPay server automatically - NO need to use the fragment opt-txindex.yml.
-* [opt-add-electrum-ps](docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml), to integrate Electrum Personal Server (EPS) with BTCPay (EPS is a  single-user alternative to the ElectrumX Server option above).  EPS will also use the BTCPay server's full bitcoin node for complete privacy when using your own Electrum wallet, for your own personal use (i.e. other users cannot use your server to verify transactions).  Also, the bitcoin option `-txindex` is NOT mandatory for EPS, and it will run on a pruned node (unlike ElectrumX).  You will need to add your XPUB/YPUB/ZPUB as environment variable `EPS_XPUB` before enabling EPS for the first time (see above section on environment variables, and see [full documentation](https://docs.btcpayserver.org/ElectrumPersonalServer/) for details).
+* [opt-add-electrumx](docker-compose-generator/docker-fragments/opt-add-electrumx.yml), to integrate a full ElectrumX server (from official source) with BTCPay, using the BTCPay server's full bitcoin node for complete privacy when using your own Electrum wallet.  You can also open port 50002 up to the internet on your router etc, to be part of the ElectrumX network, helping other Electrum wallet users to get connected. The bitcoin option `-txindex` is mandatory for ElectrumX, and this fragment will enable it on your BTCPay server automatically - No need to use the fragment opt-txindex.yml.
+* [opt-add-electrum-ps](docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml), to integrate Electrum Personal Server (EPS) with BTCPay (EPS is a single-user alternative to the ElectrumX Server option above).  EPS will also use the BTCPay server's full bitcoin node for complete privacy when using your own Electrum wallet, for your own personal use (i.e. other users cannot use your server to verify transactions).  Also, the bitcoin option `-txindex` is NOT mandatory for EPS, and it will run on a pruned node (unlike ElectrumX).  You will need to add your XPUB/YPUB/ZPUB as environment variable `EPS_XPUB` before enabling EPS for the first time (see above section on environment variables, and see [full documentation](https://docs.btcpayserver.org/ElectrumPersonalServer/) for details).
 * [opt-add-electrum-bwt](docker-compose-generator/docker-fragments/opt-add-bwt.yml), to integrate the [Bitcoin Wallet Tracker](https://github.com/bwt-dev/bwt) Electrum server, which uses a personal wallet index model similar to that of EPS. You will need to set `BWT_XPUB` with your XPUB/YPUB/ZPUB (see environment variables section). The server will only be available locally and through an onion service.
 * [opt-add-configurator](docker-compose-generator/docker-fragments/opt-add-configurator.yml), to integrate the [BTCPay Server Configurator](https://install.btcpayserver.org) to manage your BTCPay deployment through a UI, and to allow new deployments elsewhere easily.
 * [opt-add-pihole](docker-compose-generator/docker-fragments/opt-add-pihole.yml) ([See the documentation](docs/pihole.md))
 * [opt-add-bluewallet-lndhub](docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml) for [Bluewallet LNDHub](https://github.com/BlueWallet/LndHub) - Use non-custodial LND Lightning directly from your Bluewallet, and freely let others open accounts on your node. Fragment maintained by [maltokyo](https://github.com/maltokyo).
 * [opt-add-ndlc](docker-compose-generator/docker-fragments/opt-add-ndlc.yml) ([See the documentation](docs/ndlc.md))
 * [opt-add-lightning-terminal](docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml) for [Lightning Terminal/LiT](https://github.com/lightninglabs/lightning-terminal). Maintained by [dennisreimann](https://github.com/dennisreimann).
+* [opt-add-mempool](docker-compose-generator/docker-fragments/opt-add-mempool.yml) for [Mempool](https://github.com/mempool/mempool). Maintained by [dennisreimann](https://github.com/dennisreimann).
 * [opt-add-sphinxrelay](docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml) for [Sphinx Relay](https://github.com/stakwork/sphinx-relay). Maintained by [dennisreimann](https://github.com/dennisreimann).
 * [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/dennisreimann/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann).
 * [opt-add-thunderhub](docker-compose-generator/docker-fragments/opt-add-thunderhub.yml) for a LND Lightning Node Manager in your Browser. Maintained by [apotdevin](https://github.com/apotdevin).
@@ -390,6 +391,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) |
 | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) |
 | lightninglabs/lightning-terminal | v0.6.7-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.7-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.7-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) |
+| mempool/mempool | v2.5.0-dev1 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/frontend) |
 | kukks/nnostr-relay | v0.0.7 | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [Github](https://github.com/kukks/nnostr) - [DockerHub](https://hub.docker.com/r/kukks/nnostr-relay) |
 | sphinxlightning/sphinx-relay | v2.2.9 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) |
 | dennisreimann/tallycoin_connect | v1.7.3 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) |
diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index 29e68b1..352b932 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -298,6 +298,14 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitRef = $"{image.Tag}";
                     dockerInfo.SupportedByUs = false;
                     break;
+                case "mempool":
+                    dockerInfo.DockerFilePath = "docker/frontend/Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = "docker/frontend/Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = "docker/frontend/Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/mempool/mempool";
+                    dockerInfo.GitRef = $"{image.Tag}";
+                    dockerInfo.SupportedByUs = false;
+                    break;
                 case "docker-bitcoingold":
                     dockerInfo.DockerFilePath = $"bitcoingold/{image.Tag}/Dockerfile";
                     dockerInfo.GitLink = "https://github.com/Vutov/docker-bitcoin";
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index acbfe92..699ecab 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -741,7 +741,7 @@ DOCKERFILE="Dockerfile"
 echo "Building fireflyiii/core:latest"
 git clone https://dev.azure.com/Firefly-III/_git/MainImage core
 cd core
-git checkout 
+git checkout
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" .
 cd - && cd ..
@@ -817,6 +817,18 @@ docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.7-alpha-
 cd - && cd ..
 
 
+# Build mempool
+# https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile
+DOCKERFILE="docker/frontend/Dockerfile"
+echo "Building mempool/mempool:v2.5.0-dev1"
+git clone https://github.com/mempool/mempool mempool
+cd mempool
+git checkout v2.5.0-dev1
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "mempool/mempool:v2.5.0-dev1" .
+cd - && cd ..
+
+
 # Build ndlc-cli
 # https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile
 DOCKERFILE="amd64.Dockerfile"
@@ -1163,5 +1175,3 @@ git checkout master
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" .
 cd - && cd ..
-
-
diff --git a/docker-compose-generator/docker-fragments/opt-add-electrumx.yml b/docker-compose-generator/docker-fragments/opt-add-electrumx.yml
index e92d392..428935c 100644
--- a/docker-compose-generator/docker-fragments/opt-add-electrumx.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-electrumx.yml
@@ -8,6 +8,8 @@ services:
   electrumx:
     image: lukechilds/electrumx
     restart: unless-stopped
+    expose:
+      - "50001"
     ports:
       - "50002:50002"
     volumes:
@@ -20,4 +22,4 @@ volumes:
 incompatible:
   - pruning
 required:
-  - "opt-txindex"
\ No newline at end of file
+  - "opt-txindex"
diff --git a/docker-compose-generator/docker-fragments/opt-add-mempool.yml b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
index 9ecc423..eeacf6b 100644
--- a/docker-compose-generator/docker-fragments/opt-add-mempool.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
@@ -8,9 +8,8 @@ services:
         # We need to use rpcauth because we also need cookieauth. rpcpassword disabled cookie file auth.
         # Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped.
         rpcauth=mempool:d77ee0acf132038f6aaa9d4500d745ec$$72cc78dcf18191c91d10c15ff8f7c3dbbd170c4d3107cca35d71c6bf96af2ed9
-
   mempool_web:
-    image: mempool/frontend:latest
+    image: mempool/frontend:v2.5.0-dev1
     restart: on-failure
     stop_grace_period: 1m
     command: "./wait-for mempool_db:3306 --timeout=720 -- nginx -g 'daemon off;'"
@@ -21,16 +20,19 @@ services:
       BACKEND_MAINNET_HTTP_HOST: "mempool_api"
 
   mempool_api:
-    image: mempool/backend:latest
+    image: mempool/backend:v2.5.0-dev1
     restart: on-failure
     stop_grace_period: 1m
     command: "./wait-for-it.sh mempool_db:3306 --timeout=720 --strict -- ./start.sh"
     volumes:
       - mempool_api_datadir:/backend/cache
+    expose:
+      - "8999"
     environment:
       MEMPOOL_BACKEND: "electrum"
+      MEMPOOL_CACHE_DIR: "/backend/cache"
       ELECTRUM_HOST: "electrumx"
-      ELECTRUM_PORT: "50002"
+      ELECTRUM_PORT: "50001"
       ELECTRUM_TLS_ENABLED: "false"
       CORE_RPC_HOST: "bitcoind"
       CORE_RPC_PORT: "43782"

From 4bedfc3439024b25e950b73ee322199c686c75fd Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Wed, 12 Oct 2022 12:29:11 +0200
Subject: [PATCH 05/20] Update Production/nginx.tmpl

Co-authored-by: Markus Petzsch <markus@petzsch.eu>
---
 Production/nginx.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 90fbfce..499223c 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -225,7 +225,6 @@
 		sub_filter '/resources'             '/mempool/resources';
 
 		proxy_set_header Accept-Encoding "";
-		proxy_pass http://mempool_web:8080/;
 
 		# mainnet API
 		location /mempool/api/v1/ws {

From c0a5e89091960d54605c0a87d95f4cb0594d3640 Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Wed, 12 Oct 2022 12:29:30 +0200
Subject: [PATCH 06/20] Update Production/nginx.tmpl

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

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 499223c..99ada75 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -224,8 +224,6 @@
 		sub_filter '/api/v1/'               '/mempool/api/v1/';
 		sub_filter '/resources'             '/mempool/resources';
 
-		proxy_set_header Accept-Encoding "";
-
 		# mainnet API
 		location /mempool/api/v1/ws {
 			proxy_pass http://mempool_api:8999;

From f8eae35674a02bf89c38cf0bf2a2fdf4e873b5f3 Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Wed, 12 Oct 2022 12:33:33 +0200
Subject: [PATCH 07/20] Update Production/nginx.tmpl

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

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 99ada75..dd5ab12 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -221,7 +221,7 @@
 		sub_filter_once off;
 
 		sub_filter 'base href="/'           'base href="/mempool/';
-		sub_filter '/api/v1/'               '/mempool/api/v1/';
+		sub_filter '/api/'               '/mempool/api/';
 		sub_filter '/resources'             '/mempool/resources';
 
 		# mainnet API

From b85041e25e3851744cee5d63b71808465f35c125 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 13 Oct 2022 09:56:53 +0900
Subject: [PATCH 08/20] bump woocommerce

---
 README.md                                      |  2 +-
 contrib/DockerFileBuildHelper/Program.cs       | 12 +++++++-----
 contrib/build-all-images.sh                    | 18 ++++++++++--------
 .../docker-fragments/opt-add-woocommerce.yml   |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 7bc3c3c..13df0cc 100644
--- a/README.md
+++ b/README.md
@@ -361,6 +361,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) |
 | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) |
 | btcpayserver/tor | 0.4.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.7.8/Tor/0.4.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) |
+| btcpayserver/woocommerce | 3.1.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxamd64.Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/woocommerce) |
 | btcpayserver/postgres | 13.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.7/Postgres/13.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.7/Postgres/13.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.7/Postgres/13.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) |
 | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) |
 | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) |
@@ -395,7 +396,6 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | dennisreimann/tallycoin_connect | v1.7.3 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) |
 | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) |
 | apotdevin/thunderhub | base-v0.13.11 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
-| btcpayserver/docker-woocommerce | 3.0.16 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.16/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) |
 | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) |
 | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) |
 | memcached | 1.5.22-alpine | [✔️](https://raw.githubusercontent.com/docker-library/memcached/master/alpine/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/memcached) - [DockerHub](https://hub.docker.com/_/memcached) |
diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index 29e68b1..ec9215b 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -246,6 +246,13 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitRef = $"EPS/{image.Tag}";
                     dockerInfo.SupportedByUs = true;
                     break;
+                case "woocommerce":
+                    dockerInfo.DockerFilePath = $"WooCommerce/{NoRevision(image.Tag)}/linuxamd64.Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = $"WooCommerce/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps";
+                    dockerInfo.GitRef = $"WooCommerce/{image.Tag}";
+                    dockerInfo.SupportedByUs = true;
+                    break;
                 case "cloudflared":
                     dockerInfo.DockerFilePath = $"Cloudflared/{NoRevision(image.Tag)}/linuxamd64.Dockerfile";
                     dockerInfo.DockerFilePathARM32v7 = $"Cloudflared/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile";
@@ -370,11 +377,6 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitLink = "https://github.com/JeffVandrewJr/isso";
                     dockerInfo.GitRef = $"patron.{image.Tag.Substring("atron.".Length)}";
                     break;
-                case "docker-woocommerce":
-                    dockerInfo.DockerFilePath = $"Dockerfile";
-                    dockerInfo.GitLink = "https://github.com/btcpayserver/docker-woocommerce";
-                    dockerInfo.GitRef = $"v{image.Tag}";
-                    break;
                 case "mariadb":
                     dockerInfo.DockerFilePath = $"{image.Tag}/Dockerfile";
                     dockerInfo.GitLink = "https://github.com/docker-library/mariadb";
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index acbfe92..dfc215b 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -993,15 +993,17 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.8" .
 cd - && cd ..
 
 
-# Build docker-woocommerce
-# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.16/Dockerfile
-DOCKERFILE="Dockerfile"
-echo "Building btcpayserver/docker-woocommerce:3.0.16"
-git clone https://github.com/btcpayserver/docker-woocommerce docker-woocommerce
-cd docker-woocommerce
-git checkout v3.0.16
+# Build woocommerce
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxamd64.Dockerfile
+DOCKERFILE="WooCommerce/3.1.0/linuxamd64.Dockerfile"
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxarm64v8.Dockerfile
+[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="WooCommerce/3.1.0/linuxarm64v8.Dockerfile"
+echo "Building btcpayserver/woocommerce:3.1.0"
+git clone https://github.com/btcpayserver/dockerfile-deps woocommerce
+cd woocommerce
+git checkout WooCommerce/3.1.0
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.16" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/woocommerce:3.1.0" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml
index 0680b94..c0d5c12 100644
--- a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   woocommerce:
-    image: btcpayserver/docker-woocommerce:3.0.16
+    image: btcpayserver/woocommerce:3.1.0
     environment:
       WOOCOMMERCE_HOST: ${WOOCOMMERCE_HOST}
       WORDPRESS_DB_HOST: mariadb

From ab402fa51ee13c4cc6c5a7648be579b7d3870ffc Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Tue, 18 Oct 2022 22:21:03 +0900
Subject: [PATCH 09/20] bump bitcoin core

---
 README.md                                            |  2 +-
 contrib/build-all-images.sh                          | 12 ++++++------
 .../docker-fragments/bitcoin.yml                     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 13df0cc..34ed03a 100644
--- a/README.md
+++ b/README.md
@@ -346,7 +346,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | saubyk/c-lightning-rest | 0.7.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.2/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) |
 | shahanafarooqui/rtl | 0.12.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) |
 | btcpayserver/lnd | v0.15.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) |
-| btcpayserver/bitcoin | 23.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) |
+| btcpayserver/bitcoin | 23.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) |
 | btcpayserver/btcpayserver | 1.6.12$<BTCPAY_BUILD_CONFIGURATION>? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
 | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) |
 | nicolasdorier/nbxplorer | 2.3.39 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index dfc215b..9cd78ec 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -202,18 +202,18 @@ cd - && cd ..
 
 
 # Build bitcoin
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxamd64.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxamd64.Dockerfile
 DOCKERFILE="Bitcoin/23.0/linuxamd64.Dockerfile"
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxarm32v7.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm32v7.Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/23.0/linuxarm32v7.Dockerfile"
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0/Bitcoin/23.0/linuxarm64v8.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm64v8.Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/23.0/linuxarm64v8.Dockerfile"
-echo "Building btcpayserver/bitcoin:23.0"
+echo "Building btcpayserver/bitcoin:23.0-1"
 git clone https://github.com/btcpayserver/dockerfile-deps bitcoin
 cd bitcoin
-git checkout Bitcoin/23.0
+git checkout Bitcoin/23.0-1
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:23.0" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:23.0-1" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml
index 0697454..955a40b 100644
--- a/docker-compose-generator/docker-fragments/bitcoin.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin.yml
@@ -4,7 +4,7 @@ services:
   bitcoind:
     restart: unless-stopped
     container_name: btcpayserver_bitcoind
-    image: btcpayserver/bitcoin:23.0
+    image: btcpayserver/bitcoin:23.0-1
     environment:
       BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       BITCOIN_WALLETDIR: "/walletdata"

From b944945fb24acdc53f7e60c7fdfcd69b3cb77621 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Tue, 18 Oct 2022 22:26:25 +0900
Subject: [PATCH 10/20] bump nbx

---
 README.md                                            |  2 +-
 contrib/build-all-images.sh                          | 12 ++++++------
 .../docker-fragments/nbxplorer.yml                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 34ed03a..553604b 100644
--- a/README.md
+++ b/README.md
@@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | btcpayserver/bitcoin | 23.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) |
 | btcpayserver/btcpayserver | 1.6.12$<BTCPAY_BUILD_CONFIGURATION>? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
 | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) |
-| nicolasdorier/nbxplorer | 2.3.39 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
+| nicolasdorier/nbxplorer | 2.3.40 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
 | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) |
 | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) |
 | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index 9cd78ec..bf5d687 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -480,18 +480,18 @@ cd - && cd ..
 
 
 # Build nbxplorer
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxamd64
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxamd64
 DOCKERFILE="Dockerfile.linuxamd64"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm32v7
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm32v7
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.39/Dockerfile.linuxarm64v8
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm64v8
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8"
-echo "Building nicolasdorier/nbxplorer:2.3.39"
+echo "Building nicolasdorier/nbxplorer:2.3.40"
 git clone https://github.com/dgarage/nbxplorer nbxplorer
 cd nbxplorer
-git checkout v2.3.39
+git checkout v2.3.40
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.39" .
+docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.40" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml
index 0c4cc61..3b19103 100644
--- a/docker-compose-generator/docker-fragments/nbxplorer.yml
+++ b/docker-compose-generator/docker-fragments/nbxplorer.yml
@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.3.39
+    image: nicolasdorier/nbxplorer:2.3.40
     expose:
       - "32838"
     environment:

From 592210e9415b2404793be5323089cd53c6667e25 Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Tue, 18 Oct 2022 20:33:15 +0200
Subject: [PATCH 11/20] Backup: Add optional MariaDB (#706)

---
 btcpay-backup.sh  | 48 ++++++++++++++++++++++----------
 btcpay-restore.sh | 71 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/btcpay-backup.sh b/btcpay-backup.sh
index 49b1d2e..aa15a5d 100755
--- a/btcpay-backup.sh
+++ b/btcpay-backup.sh
@@ -28,10 +28,10 @@ fi
 . "$BASH_PROFILE_SCRIPT"
 
 docker_dir=$(docker volume inspect generated_btcpay_datadir --format="{{.Mountpoint}}" | sed -e "s%/volumes/.*%%g")
-dbdump_name=postgres.sql.gz
+postgres_dump_name=postgres.sql.gz
 btcpay_dir="$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
 backup_dir="$docker_dir/volumes/backup_datadir/_data"
-dbdump_path="$docker_dir/$dbdump_name"
+postgres_dump_path="$docker_dir/$postgres_dump_name"
 backup_path="$backup_dir/backup.tar.gz"
 
 # ensure backup dir exists
@@ -42,31 +42,50 @@ fi
 cd $btcpay_dir
 . helpers.sh
 
-dbcontainer=$(docker ps -a -q -f "name=postgres_1")
-if [ -z "$dbcontainer" ]; then
+# Postgres database
+postgres_container=$(docker ps -a -q -f "name=postgres_1")
+if [ -z "$postgres_container" ]; then
   printf "\n"
-  echo "ℹ️ Database container is not up and running. Starting BTCPay Server …"
+  echo "ℹ️ Postgres container is not up and running. Starting BTCPay Server …"
   docker volume create generated_postgres_datadir
   docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d postgres
 
   printf "\n"
-  dbcontainer=$(docker ps -a -q -f "name=postgres_1")
-  if [ -z "$dbcontainer" ]; then
-    echo "🚨 Database container could not be started or found."
+  postgres_container=$(docker ps -a -q -f "name=postgres_1")
+  if [ -z "$postgres_container" ]; then
+    echo "🚨 Postgres container could not be started or found."
     exit 1
   fi
 fi
 
 printf "\n"
-echo "ℹ️ Dumping database …"
+echo "ℹ️ Dumping Postgres database …"
 {
-  docker exec $dbcontainer pg_dumpall -c -U postgres | gzip > $dbdump_path
-  echo "✅ Database dump done."
+  docker exec $postgres_container pg_dumpall -c -U postgres | gzip > $postgres_dump_path
+  echo "✅ Postgres database dump done."
 } || {
-  echo "🚨 Dumping failed. Please check the error message above."
+  echo "🚨 Dumping Postgres database failed. Please check the error message above."
   exit 1
 }
 
+# Optional: MariaDB database
+mariadb_container=$(docker ps -a -q -f "name=mariadb_1")
+if [ ! -z "$mariadb_container" ]; then
+  mariadb_dump_name=mariadb.sql.gz
+  mariadb_dump_path="$docker_dir/$mariadb_dump_name"
+  # MariaDB container exists and is running - dump it
+  printf "\n"
+  echo "ℹ️ Dumping MariaDB database …"
+  {
+    docker exec $mariadb_container mysqldump -u root -pwordpressdb -A --add-drop-database | gzip > $mariadb_dump_path
+    echo "✅ MariaDB database dump done."
+  } || {
+    echo "🚨 Dumping MariaDB database failed. Please check the error message above."
+    exit 1
+  }
+fi
+
+# BTCPay Server backup
 printf "\nℹ️ Stopping BTCPay Server …\n\n"
 btcpay_down
 
@@ -85,12 +104,13 @@ echo "ℹ️ Archiving files in $(pwd)…"
     --exclude="volumes/generated_litecoin_datadir/_data/chainstate" \
     --exclude="volumes/generated_litecoin_datadir/_data/indexes" \
     --exclude="volumes/generated_litecoin_datadir/_data/debug.log" \
+    --exclude="volumes/generated_mariadb_datadir" \
     --exclude="volumes/generated_postgres_datadir" \
     --exclude="volumes/generated_electrumx_datadir" \
     --exclude="volumes/generated_lnd_bitcoin_datadir/_data/data/graph" \
     --exclude="volumes/generated_clightning_bitcoin_datadir/_data/lightning-rpc" \
     --exclude="**/logs/*" \
-    -cvzf $backup_path $dbdump_name volumes/generated_*
+    -cvzf $backup_path $postgres_dump_name  $mariadb_dump_name volumes/generated_*
   echo "✅ Archive done."
 
   if [ ! -z "$BTCPAY_BACKUP_PASSPHRASE" ]; then
@@ -122,6 +142,6 @@ cd $btcpay_dir
 btcpay_up
 
 printf "\nℹ️ Cleaning up …\n\n"
-rm $dbdump_path
+rm $postgres_dump_path
 
 printf "✅ Backup done => $backup_path\n\n"
diff --git a/btcpay-restore.sh b/btcpay-restore.sh
index 214b5c6..e9bbb7f 100755
--- a/btcpay-restore.sh
+++ b/btcpay-restore.sh
@@ -28,7 +28,7 @@ fi
 # preparation
 docker_dir=$(docker volume inspect generated_btcpay_datadir --format="{{.Mountpoint}}" | sed -e "s%/volumes/.*%%g")
 restore_dir="$docker_dir/volumes/backup_datadir/_data/restore"
-dbdump_name=postgres.sql.gz
+postgres_dump_name=postgres.sql.gz
 btcpay_dir="$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
 
 # ensure clean restore dir
@@ -54,8 +54,8 @@ echo "ℹ️ Extracting files in $(pwd) …"
 tar -xvf $backup_path -C $restore_dir
 
 # basic control checks
-if [ ! -f "$dbdump_name" ]; then
-  printf "\n🚨 $dbdump_name does not exist.\n\n"
+if [ ! -f "$postgres_dump_name" ]; then
+  printf "\n🚨 $postgres_dump_name does not exist.\n\n"
   exit 1
 fi
 
@@ -64,6 +64,10 @@ if [ ! -d "volumes" ]; then
   exit 1
 fi
 
+if [ -f "mariadb.sql.gz" ]; then
+  mariadb_dump_name=mariadb.sql.gz
+fi
+
 cd $btcpay_dir
 . helpers.sh
 
@@ -82,6 +86,9 @@ cd $restore_dir
   cp -r volumes/* $docker_dir/volumes/
   # ensure datadirs excluded in backup exist
   mkdir -p $docker_dir/volumes/generated_postgres_datadir/_data
+  if [ ! -z "$mariadb_dump_name" ]; then
+    mkdir -p $docker_dir/volumes/generated_mariadb_datadir/_data
+  fi
   echo "✅ Volume restore done."
 } || {
   echo "🚨  Restoring volumes failed. Please check the error message above."
@@ -91,40 +98,80 @@ cd $restore_dir
   exit 1
 }
 
+# Start Postgres database
 {
-  printf "\nℹ️ Starting database container …\n"
+  printf "\nℹ️ Starting Postgres database container …\n"
   docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d postgres
   sleep 10
-  dbcontainer=$(docker ps -a -q -f "name=postgres")
-  if [ -z "$dbcontainer" ]; then
-    echo "🚨 Database container could not be started or found."
+  postgres_container=$(docker ps -a -q -f "name=postgres_1")
+  if [ -z "$postgres_container" ]; then
+    echo "🚨 Postgres database container could not be started or found."
     printf "\nℹ️ Restarting BTCPay Server …\n\n"
     cd $btcpay_dir
     btcpay_up
     exit 1
   fi
 } || {
-  echo "🚨 Starting database container failed. Please check the error message above."
+  echo "🚨 Starting Postgres database container failed. Please check the error message above."
   printf "\nℹ️ Restarting BTCPay Server …\n\n"
   cd $btcpay_dir
   btcpay_up
   exit 1
 }
 
+# Optional: Start MariaDB database
+if [ ! -z "$mariadb_dump_name" ]; then
+  {
+    printf "\nℹ️ Starting MariaDB database container …\n"
+    docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d mariadb
+    sleep 10
+    mariadb_container=$(docker ps -a -q -f "name=mariadb_1")
+    if [ -z "$mariadb_container" ]; then
+      echo "🚨 MariaDB database container could not be started or found."
+      printf "\nℹ️ Restarting BTCPay Server …\n\n"
+      cd $btcpay_dir
+      btcpay_up
+      exit 1
+    fi
+  } || {
+    echo "🚨 Starting MariaDB database container failed. Please check the error message above."
+    printf "\nℹ️ Restarting BTCPay Server …\n\n"
+    cd $btcpay_dir
+    btcpay_up
+    exit 1
+  }
+fi
+
 cd $restore_dir
 
+# Postgres database
 {
-  printf "\nℹ️ Restoring database …"
-  gunzip -c $dbdump_name | docker exec -i $dbcontainer psql -U postgres postgres -a
-  echo "✅ Database restore done."
+  printf "\nℹ️ Restoring Postgres database …"
+  gunzip -c $postgres_dump_name | docker exec -i $postgres_container psql -U postgres postgres
+  echo "✅ Postgres database restore done."
 } || {
-  echo "🚨 Restoring database failed. Please check the error message above."
+  echo "🚨 Restoring Postgres database failed. Please check the error message above."
   printf "\nℹ️  Restarting BTCPay Server …\n\n"
   cd $btcpay_dir
   btcpay_up
   exit 1
 }
 
+# Optional: MariaDB database
+if [ ! -z "$mariadb_dump_name" ]; then
+  {
+    printf "\nℹ️ Restoring MariaDB database …"
+    gunzip -c $mariadb_dump_name | docker exec -i $mariadb_container mysql -u root -pwordpressdb
+    printf "\n✅ MariaDB database restore done."
+  } || {
+    echo "🚨 Restoring MariaDB database failed. Please check the error message above."
+    printf "\nℹ️  Restarting BTCPay Server …\n\n"
+    cd $btcpay_dir
+    btcpay_up
+    exit 1
+  }
+fi
+
 printf "\nℹ️ Restarting BTCPay Server …\n\n"
 cd $btcpay_dir
 btcpay_up

From 8d80b2eb63c7fcd75b48d12fe5a4dd012283908b Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 19 Oct 2022 22:10:42 +0900
Subject: [PATCH 12/20] bump lnd

---
 README.md                                            |  2 +-
 contrib/build-all-images.sh                          | 12 ++++++------
 .../docker-fragments/bitcoin-lnd.yml                 |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 553604b..aec19f1 100644
--- a/README.md
+++ b/README.md
@@ -345,7 +345,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) |
 | saubyk/c-lightning-rest | 0.7.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.7.2/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) |
 | shahanafarooqui/rtl | 0.12.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.3/dockerfiles/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) |
-| btcpayserver/lnd | v0.15.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) |
+| btcpayserver/lnd | v0.15.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) |
 | btcpayserver/bitcoin | 23.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) |
 | btcpayserver/btcpayserver | 1.6.12$<BTCPAY_BUILD_CONFIGURATION>? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
 | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index bf5d687..d74f70f 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -170,18 +170,18 @@ cd - && cd ..
 
 
 # Build lnd
-# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxamd64.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.3-beta/linuxamd64.Dockerfile
 DOCKERFILE="linuxamd64.Dockerfile"
-# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxarm32v7.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.3-beta/linuxarm32v7.Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
-# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.2-beta/linuxarm64v8.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.15.3-beta/linuxarm64v8.Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile"
-echo "Building btcpayserver/lnd:v0.15.2-beta"
+echo "Building btcpayserver/lnd:v0.15.3-beta"
 git clone https://github.com/btcpayserver/lnd lnd
 cd lnd
-git checkout basedon-v0.15.2-beta
+git checkout basedon-v0.15.3-beta
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.15.2-beta" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.15.3-beta" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index 89d2f96..ab33cc9 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:v0.15.2-beta
+    image: btcpayserver/lnd:v0.15.3-beta
     container_name: btcpayserver_lnd_bitcoin
     restart: unless-stopped
     environment:

From b2b2ced877aef70040bfbdb53feb15297531103a Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Oct 2022 18:25:57 +0900
Subject: [PATCH 13/20] bump nbx

---
 README.md                                            |  2 +-
 contrib/build-all-images.sh                          | 12 ++++++------
 .../docker-fragments/nbxplorer.yml                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index aec19f1..c6927e8 100644
--- a/README.md
+++ b/README.md
@@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | btcpayserver/bitcoin | 23.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) |
 | btcpayserver/btcpayserver | 1.6.12$<BTCPAY_BUILD_CONFIGURATION>? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
 | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) |
-| nicolasdorier/nbxplorer | 2.3.40 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
+| nicolasdorier/nbxplorer | 2.3.41 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
 | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) |
 | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) |
 | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index d74f70f..ec9c20a 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -480,18 +480,18 @@ cd - && cd ..
 
 
 # Build nbxplorer
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxamd64
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxamd64
 DOCKERFILE="Dockerfile.linuxamd64"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm32v7
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm32v7
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.40/Dockerfile.linuxarm64v8
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm64v8
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8"
-echo "Building nicolasdorier/nbxplorer:2.3.40"
+echo "Building nicolasdorier/nbxplorer:2.3.41"
 git clone https://github.com/dgarage/nbxplorer nbxplorer
 cd nbxplorer
-git checkout v2.3.40
+git checkout v2.3.41
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.40" .
+docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.41" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml
index 3b19103..fa906c1 100644
--- a/docker-compose-generator/docker-fragments/nbxplorer.yml
+++ b/docker-compose-generator/docker-fragments/nbxplorer.yml
@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.3.40
+    image: nicolasdorier/nbxplorer:2.3.41
     expose:
       - "32838"
     environment:

From 22a635a7f3e420b3461afd271e34000ed6f1674e Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Thu, 20 Oct 2022 13:28:50 +0200
Subject: [PATCH 14/20] Upgrade Tallycoin Connect

Also switches to the official image. @djbooth007 is now the source for the Docker images, which up to now I maintained for my fork.
---
 README.md                                      |  4 ++--
 contrib/DockerFileBuildHelper/Program.cs       |  2 +-
 contrib/build-all-images.sh                    | 18 ++++++++----------
 .../opt-add-tallycoin-connect.yml              |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c6927e8..4187862 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are:
 * [opt-add-ndlc](docker-compose-generator/docker-fragments/opt-add-ndlc.yml) ([See the documentation](docs/ndlc.md))
 * [opt-add-lightning-terminal](docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml) for [Lightning Terminal/LiT](https://github.com/lightninglabs/lightning-terminal). Maintained by [dennisreimann](https://github.com/dennisreimann).
 * [opt-add-sphinxrelay](docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml) for [Sphinx Relay](https://github.com/stakwork/sphinx-relay). Maintained by [dennisreimann](https://github.com/dennisreimann).
-* [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/dennisreimann/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann).
+* [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/djbooth007/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann).
 * [opt-add-thunderhub](docker-compose-generator/docker-fragments/opt-add-thunderhub.yml) for a LND Lightning Node Manager in your Browser. Maintained by [apotdevin](https://github.com/apotdevin).
 * [opt-add-teos](docker-compose-generator/docker-fragments/opt-add-teos.yml) for [The Eye Of Satoshi](https://github.com/talaia-labs/python-teos), a BOLT13 Lightning Watchtower. Use port 9814 on your server or Tor to connect.
 * [opt-add-chatwoot](docker-compose-generator/docker-fragments/opt-add-chatwoot.yml) for open source chat support system.  ([See the documentation](docs/chatwoot.md))
@@ -393,7 +393,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | lightninglabs/lightning-terminal | v0.6.7-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.7-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.7-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) |
 | kukks/nnostr-relay | v0.0.7 | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [Github](https://github.com/kukks/nnostr) - [DockerHub](https://hub.docker.com/r/kukks/nnostr-relay) |
 | sphinxlightning/sphinx-relay | v2.2.9 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) |
-| dennisreimann/tallycoin_connect | v1.7.3 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) |
+| djbooth007/tallycoin_connect | v1.7.5 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/djbooth007/tallycoin_connect) |
 | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) |
 | apotdevin/thunderhub | base-v0.13.11 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
 | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) |
diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index ec9215b..9b3100d 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -294,7 +294,7 @@ namespace DockerFileBuildHelper
                     dockerInfo.DockerFilePath = "Dockerfile";
                     dockerInfo.DockerFilePathARM32v7 = $"Dockerfile.arm32v7";
                     dockerInfo.DockerFilePathARM64v8 = $"Dockerfile.arm64v8";
-                    dockerInfo.GitLink = "https://github.com/dennisreimann/tallycoin_connect";
+                    dockerInfo.GitLink = "https://github.com/djbooth007/tallycoin_connect";
                     dockerInfo.GitRef = $"{image.Tag}";
                     dockerInfo.SupportedByUs = false;
                     break;
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index ec9c20a..5c801e1 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -741,7 +741,7 @@ DOCKERFILE="Dockerfile"
 echo "Building fireflyiii/core:latest"
 git clone https://dev.azure.com/Firefly-III/_git/MainImage core
 cd core
-git checkout 
+git checkout
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" .
 cd - && cd ..
@@ -882,18 +882,18 @@ cd - && cd ..
 
 
 # Build tallycoin_connect
-# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile
+# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile
 DOCKERFILE="Dockerfile"
-# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm32v7
+# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm32v7
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7"
-# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm64v8
+# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm64v8
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8"
-echo "Building dennisreimann/tallycoin_connect:v1.7.3"
-git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect
+echo "Building djbooth007/tallycoin_connect:v1.7.5"
+git clone https://github.com/djbooth007/tallycoin_connect tallycoin_connect
 cd tallycoin_connect
-git checkout v1.7.3
+git checkout v1.7.5
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.3" .
+docker build -f "$DOCKERFILE" -t "djbooth007/tallycoin_connect:v1.7.5" .
 cd - && cd ..
 
 
@@ -1165,5 +1165,3 @@ git checkout master
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" .
 cd - && cd ..
-
-
diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml
index eab34a6..9eaaeb6 100644
--- a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml
@@ -6,7 +6,7 @@ services:
     volumes:
       - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir"
   tallycoin_connect:
-    image: "dennisreimann/tallycoin_connect:v1.7.3"
+    image: "djbooth007/tallycoin_connect:v1.7.5"
     restart: unless-stopped
     expose:
       - "8123"

From e687dd162ed22124a85265d1359b72275e4b3654 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 20 Oct 2022 22:54:27 +0900
Subject: [PATCH 15/20] bump litecoin

---
 README.md                                            |  2 +-
 contrib/build-all-images.sh                          | 12 ++++++------
 .../docker-fragments/litecoin.yml                    |  5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c6927e8..45b9b9d 100644
--- a/README.md
+++ b/README.md
@@ -378,7 +378,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) |
 | btcpayserver/groestlcoin | 23.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/23.0/Groestlcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/23.0/Groestlcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/23.0/Groestlcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/groestlcoin) |
 | btcpayserver/elements | 0.21.0.2-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.2-1/Elements/0.21.0.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.2-1/Elements/0.21.0.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.2-1/Elements/0.21.0.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) |
-| btcpayserver/litecoin | 0.21.2.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-1/Litecoin/0.21.2.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-1/Litecoin/0.21.2.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-1/Litecoin/0.21.2.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) |
+| btcpayserver/litecoin | 0.21.2.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) |
 | wakiyamap/docker-monacoin | 0.20.2 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.20.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) |
 | redis | 6.2.2-buster | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) |
 | bluewalletorganization/lndhub | v1.4.1 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.4.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.4.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.4.1/Dockerfile) | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index ec9c20a..848de30 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -420,18 +420,18 @@ cd - && cd ..
 
 
 # Build litecoin
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-1/Litecoin/0.21.2.1/linuxamd64.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxamd64.Dockerfile
 DOCKERFILE="Litecoin/0.21.2.1/linuxamd64.Dockerfile"
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-1/Litecoin/0.21.2.1/linuxarm32v7.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxarm32v7.Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Litecoin/0.21.2.1/linuxarm32v7.Dockerfile"
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-1/Litecoin/0.21.2.1/linuxarm64v8.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1-2/Litecoin/0.21.2.1/linuxarm64v8.Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Litecoin/0.21.2.1/linuxarm64v8.Dockerfile"
-echo "Building btcpayserver/litecoin:0.21.2.1-1"
+echo "Building btcpayserver/litecoin:0.21.2.1-2"
 git clone https://github.com/btcpayserver/dockerfile-deps litecoin
 cd litecoin
-git checkout Litecoin/0.21.2.1-1
+git checkout Litecoin/0.21.2.1-2
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/litecoin:0.21.2.1-1" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/litecoin:0.21.2.1-2" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml
index 461aaf4..1e7c7d7 100644
--- a/docker-compose-generator/docker-fragments/litecoin.yml
+++ b/docker-compose-generator/docker-fragments/litecoin.yml
@@ -4,9 +4,10 @@ services:
   litecoind:
     restart: unless-stopped
     container_name: btcpayserver_litecoind
-    image: btcpayserver/litecoin:0.21.2.1-1
+    image: btcpayserver/litecoin:0.21.2.1-2
     environment:
       BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      BITCOIN_WALLETDIR: "/walletdata"
       BITCOIN_EXTRA_ARGS: |
         rpcport=43782
         rpcbind=0.0.0.0:43782
@@ -18,6 +19,7 @@ services:
       - "39388"
     volumes:
       - "litecoin_datadir:/data"
+      - "litecoin_wallet_datadir:/walletdata"
   nbxplorer:
     environment:
       NBXPLORER_CHAINS: "ltc"
@@ -32,3 +34,4 @@ services:
 
 volumes:
   litecoin_datadir:
+  litecoin_wallet_datadir:
\ No newline at end of file

From dd3cc12aadd50534f078e115828e912e9c92043e Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 24 Oct 2022 23:51:11 +0900
Subject: [PATCH 16/20] bump nbx

---
 README.md                                            |  2 +-
 contrib/build-all-images.sh                          | 12 ++++++------
 .../docker-fragments/nbxplorer.yml                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 45b9b9d..f2ad369 100644
--- a/README.md
+++ b/README.md
@@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | btcpayserver/bitcoin | 23.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) |
 | btcpayserver/btcpayserver | 1.6.12$<BTCPAY_BUILD_CONFIGURATION>? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
 | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) |
-| nicolasdorier/nbxplorer | 2.3.41 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
+| nicolasdorier/nbxplorer | 2.3.42 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.42/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.42/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.42/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
 | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) |
 | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) |
 | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index 848de30..1528882 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -480,18 +480,18 @@ cd - && cd ..
 
 
 # Build nbxplorer
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxamd64
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.42/Dockerfile.linuxamd64
 DOCKERFILE="Dockerfile.linuxamd64"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm32v7
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.42/Dockerfile.linuxarm32v7
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7"
-# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.41/Dockerfile.linuxarm64v8
+# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.42/Dockerfile.linuxarm64v8
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8"
-echo "Building nicolasdorier/nbxplorer:2.3.41"
+echo "Building nicolasdorier/nbxplorer:2.3.42"
 git clone https://github.com/dgarage/nbxplorer nbxplorer
 cd nbxplorer
-git checkout v2.3.41
+git checkout v2.3.42
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.41" .
+docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.42" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml
index fa906c1..aaa6467 100644
--- a/docker-compose-generator/docker-fragments/nbxplorer.yml
+++ b/docker-compose-generator/docker-fragments/nbxplorer.yml
@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.3.41
+    image: nicolasdorier/nbxplorer:2.3.42
     expose:
       - "32838"
     environment:

From 9e1f8c2d9d7d899f4c7558cf22bf438e70c71716 Mon Sep 17 00:00:00 2001
From: Andreas Tasch <andy.tasch@gmail.com>
Date: Thu, 27 Oct 2022 14:23:58 +0200
Subject: [PATCH 17/20] Exclude _data of coins; adding Liquid, Dash, Monero.
 (#712)

* Exclude _data of coins; adding Liquid, Dash, Monero.

* Make sure Dash wallet and other stuff gets backuped too.
---
 btcpay-backup.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/btcpay-backup.sh b/btcpay-backup.sh
index aa15a5d..570b2ba 100755
--- a/btcpay-backup.sh
+++ b/btcpay-backup.sh
@@ -96,14 +96,14 @@ echo "ℹ️ Archiving files in $(pwd)…"
 {
   tar \
     --exclude="volumes/backup_datadir" \
-    --exclude="volumes/generated_bitcoin_datadir/_data/blocks" \
-    --exclude="volumes/generated_bitcoin_datadir/_data/chainstate" \
-    --exclude="volumes/generated_bitcoin_datadir/_data/indexes" \
-    --exclude="volumes/generated_bitcoin_datadir/_data/debug.log" \
-    --exclude="volumes/generated_litecoin_datadir/_data/blocks" \
-    --exclude="volumes/generated_litecoin_datadir/_data/chainstate" \
-    --exclude="volumes/generated_litecoin_datadir/_data/indexes" \
-    --exclude="volumes/generated_litecoin_datadir/_data/debug.log" \
+    --exclude="volumes/generated_bitcoin_datadir/_data" \
+    --exclude="volumes/generated_litecoin_datadir/_data" \
+    --exclude="volumes/generated_elements_datadir/_data" \
+    --exclude="volumes/generated_xmr_data/_data" \
+    --exclude="volumes/generated_dash_datadir/_data/blocks" \
+    --exclude="volumes/generated_dash_datadir/_data/chainstate" \
+    --exclude="volumes/generated_dash_datadir/_data/indexes" \
+    --exclude="volumes/generated_dash_datadir/_data/debug.log" \
     --exclude="volumes/generated_mariadb_datadir" \
     --exclude="volumes/generated_postgres_datadir" \
     --exclude="volumes/generated_electrumx_datadir" \

From 867f34ac3c55dc0509421532c5dfdb70b952edc4 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 28 Oct 2022 00:31:17 +0900
Subject: [PATCH 18/20] Remove lnd and clightning from LND

---
 .../crypto-definitions.json                   |  7 ---
 .../docker-fragments/litecoin-clightning.yml  | 34 ------------
 .../docker-fragments/litecoin-lnd.yml         | 52 -------------------
 .../linuxamd64.Dockerfile                     |  4 +-
 .../linuxarm32v7.Dockerfile                   |  4 +-
 .../linuxarm64v8.Dockerfile                   |  4 +-
 .../src/docker-compose-generator.csproj       |  6 +--
 7 files changed, 9 insertions(+), 102 deletions(-)
 delete mode 100644 docker-compose-generator/docker-fragments/litecoin-clightning.yml
 delete mode 100644 docker-compose-generator/docker-fragments/litecoin-lnd.yml

diff --git a/docker-compose-generator/crypto-definitions.json b/docker-compose-generator/crypto-definitions.json
index 28a8597..e229afb 100644
--- a/docker-compose-generator/crypto-definitions.json
+++ b/docker-compose-generator/crypto-definitions.json
@@ -1,11 +1,4 @@
 [
-  {
-    "Crypto": "ltc",
-    "CryptoFragment": "litecoin",
-    "CLightningFragment": "litecoin-clightning",
-    "LNDFragment": "litecoin-lnd",
-    "EclairFragment": null
-  },
   {
     "Crypto": "btc",
     "CryptoFragment": "bitcoin",
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
deleted file mode 100644
index 7bd5db8..0000000
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: "3"
-
-services:
-  clightning_litecoin:
-    image: btcpayserver/lightning:v0.9.0-1
-    container_name: btcpayserver_clightning_litecoin
-    restart: unless-stopped
-    environment:
-      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      LIGHTNINGD_CHAIN: ltc
-      LIGHTNINGD_ALIAS: ${LIGHTNING_ALIAS}
-      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_ANNOUNCEABLE_HOST}
-      LIGHTNINGD_PORT: 9735
-      LIGHTNINGD_READY_FILE: /root/.nbxplorer/ltc_fully_synched
-      LIGHTNINGD_OPT: |
-        bitcoin-datadir=/etc/litecoin
-        bitcoin-rpcconnect=litecoind
-    volumes:
-      - "clightning_litecoin_datadir:/root/.lightning"
-      - "litecoin_datadir:/etc/litecoin"
-      - "nbxplorer_datadir:/root/.nbxplorer"
-    ports:
-      - "9736:9735"
-    links:
-      - litecoind
-  btcpayserver:
-    environment:
-      BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc"
-    volumes:
-      - "clightning_litecoin_datadir:/etc/clightning_litecoin"
-    links:
-      - clightning_litecoin
-volumes:
-  clightning_litecoin_datadir:
diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
deleted file mode 100644
index 290fd24..0000000
--- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-version: "3"
-
-services:
-  lnd_litecoin:
-    image: btcpayserver/lnd:v0.11.0-beta
-    container_name: btcpayserver_lnd_litecoin
-    restart: unless-stopped
-    environment:
-      LND_CHAIN: "ltc"
-      LND_EXTERNALIP: ${BTCPAY_ANNOUNCEABLE_HOST}
-      LND_PORT: 9736
-      LND_ALIAS: ${LIGHTNING_ALIAS}
-      LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
-      LND_READY_FILE: /root/.nbxplorer/ltc_fully_synched
-      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
-        adminmacaroonpath=/data/admin.macaroon
-        invoicemacaroonpath=/data/invoice.macaroon
-        readonlymacaroonpath=/data/readonly.macaroon
-        notls=1
-    ports:
-      - "9736:9736"
-    expose:
-      - "8080"
-      - "9736"
-    volumes:
-      - "lnd_litecoin_datadir:/data"
-      - "litecoin_datadir:/deps/.litecoin"
-      - "nbxplorer_datadir:/root/.nbxplorer"
-    links:
-      - litecoind
-
-  btcpayserver:
-    environment:
-      BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;allowinsecure=true"
-      BTCPAY_LTCEXTERNALLNDSEEDBACKUP: "/etc/lnd_litecoin/data/chain/litecoin/${NBITCOIN_NETWORK:-regtest}/walletunlock.json"
-    volumes:
-      - "lnd_litecoin_datadir:/etc/lnd_litecoin"
-    links:
-      - lnd_litecoin
-
-volumes:
-  lnd_litecoin_datadir:
-
-required:
-  - "opt-add-zmq"
diff --git a/docker-compose-generator/linuxamd64.Dockerfile b/docker-compose-generator/linuxamd64.Dockerfile
index 0ce178b..2a37690 100644
--- a/docker-compose-generator/linuxamd64.Dockerfile
+++ b/docker-compose-generator/linuxamd64.Dockerfile
@@ -1,5 +1,5 @@
 #
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder
 WORKDIR /source
 COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
 # Cache some dependencies
@@ -8,7 +8,7 @@ COPY src/. .
 RUN dotnet publish --output /app/ --configuration Release
 
 #
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim
+FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 WORKDIR /app
diff --git a/docker-compose-generator/linuxarm32v7.Dockerfile b/docker-compose-generator/linuxarm32v7.Dockerfile
index c8ffaca..ee54ae0 100644
--- a/docker-compose-generator/linuxarm32v7.Dockerfile
+++ b/docker-compose-generator/linuxarm32v7.Dockerfile
@@ -1,5 +1,5 @@
 # This is a manifest image, will pull the image with the same arch as the builder machine
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder
 WORKDIR /source
 COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
 # Cache some dependencies
@@ -8,7 +8,7 @@ COPY src/. .
 RUN dotnet publish --output /app/ --configuration Release
 
 # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim-arm32v7
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 
diff --git a/docker-compose-generator/linuxarm64v8.Dockerfile b/docker-compose-generator/linuxarm64v8.Dockerfile
index 37ba4b5..f6b88fa 100644
--- a/docker-compose-generator/linuxarm64v8.Dockerfile
+++ b/docker-compose-generator/linuxarm64v8.Dockerfile
@@ -1,5 +1,5 @@
 # This is a manifest image, will pull the image with the same arch as the builder machine
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder
 WORKDIR /source
 COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
 # Cache some dependencies
@@ -8,7 +8,7 @@ COPY src/. .
 RUN dotnet publish --output /app/ --configuration Release
 
 # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim-arm64v8
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 
diff --git a/docker-compose-generator/src/docker-compose-generator.csproj b/docker-compose-generator/src/docker-compose-generator.csproj
index 831e3b6..d26d8be 100644
--- a/docker-compose-generator/src/docker-compose-generator.csproj
+++ b/docker-compose-generator/src/docker-compose-generator.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <LangVersion>7.3</LangVersion>
-	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.1</TargetFramework>
+    <LangVersion>10.0</LangVersion>
+	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net6.0</TargetFramework>
   <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
 	<RootNamespace>DockerGenerator</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="YamlDotNet" Version="5.2.1" />
+	  <PackageReference Include="YamlDotNet" Version="8.0.0" />
   </ItemGroup>
 </Project>

From b595fe3216c1e0455199bb5e6d4e14d2816bc70d Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 28 Oct 2022 00:38:01 +0900
Subject: [PATCH 19/20] Update CI

---
 .circleci/config.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f535457..1387b51 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,13 +53,10 @@ jobs:
   multiarch:
     machine:
       enabled: true
-      image: circleci/classic:201808-01
+      image: ubuntu-2004:202201-02
     steps:
       - run:
           command: |
-            # Turn on Experimental features
-            sudo mkdir $HOME/.docker
-            sudo sh -c 'echo "{ \"experimental\": \"enabled\" }" >> $HOME/.docker/config.json'
             #
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             #

From e265d0d18291ed096aa19fdadd47c7a80b9a64af Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 28 Oct 2022 08:49:13 +0900
Subject: [PATCH 20/20] Add missing ltc in crypto definition

---
 docker-compose-generator/crypto-definitions.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docker-compose-generator/crypto-definitions.json b/docker-compose-generator/crypto-definitions.json
index e229afb..c3201ea 100644
--- a/docker-compose-generator/crypto-definitions.json
+++ b/docker-compose-generator/crypto-definitions.json
@@ -1,4 +1,11 @@
 [
+  {
+    "Crypto": "ltc",
+    "CryptoFragment": "litecoin",
+    "CLightningFragment": null,
+    "LNDFragment": null,
+    "EclairFragment": null
+  },
   {
     "Crypto": "btc",
     "CryptoFragment": "bitcoin",