Merge branch 'master' into patch-3

docker-compose-generator/crypto-definitions.json

@@ -2,8 +2,8 @@
   {
     "Crypto": "ltc",
     "CryptoFragment": "litecoin",
-    "CLightningFragment": "litecoin-clightning",
-    "LNDFragment": "litecoin-lnd",
+    "CLightningFragment": null,
+    "LNDFragment": null,
     "EclairFragment": null
   },
   {

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:

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"

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

@@ -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:

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

@@ -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"

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:

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.42
     expose:
       - "32838"
     environment:

docker-compose-generator/docker-fragments/opt-add-electrumx.yml

@@ -4,11 +4,12 @@ services:
   bitcoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        txindex=1
         rpcauth=electrumx:7d8ee47c089e6072635f82b34796e878$$13649d99453ccdf78e85007286422599c00e6953289f41bf8e92961076ba14db
   electrumx:
     image: lukechilds/electrumx
     restart: unless-stopped
+    expose:
+      - "50001"
     ports:
       - "50002:50002"
     volumes:
@@ -20,3 +21,5 @@ volumes:
   electrumx_datadir:
 incompatible:
   - pruning
+required:
+  - "opt-txindex"

docker-compose-generator/docker-fragments/opt-add-mempool.yml

@@ -0,0 +1,72 @@
+version: '3'
+
+# reference: https://github.com/mempool/mempool/blob/master/docker/docker-compose.yml
+services:
+  bitcoind:
+    environment:
+      BITCOIN_EXTRA_ARGS: |
+        # 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:v2.5.0-dev1
+    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: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: "50001"
+      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
+    expose:
+      - "3306"
+    volumes:
+      - "mempool_db_datadir:/var/lib/mysql"
+    environment:
+      MYSQL_DATABASE: "mempool"
+      MYSQL_USER: "mempool"
+      MYSQL_PASSWORD: "mempool"
+      MYSQL_ROOT_PASSWORD: "admin"
+
+  btcpayserver:
+    environment:
+      BTCPAY_EXTERNALSERVICES: "Mempool Explorer:/mempool"
+
+volumes:
+  mempool_db_datadir:
+  mempool_api_datadir:
+
+required:
+  - "opt-add-electrumx"
+
+incompatible:
+  - pruning

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"

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

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

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
 

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
 

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>