diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 587c96d..a2c3f99 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -37,6 +37,12 @@ {{ if (eq $serviceName "bitcoin_rtl") }} location /rtl/ { proxy_pass http://bitcoin_rtl:3000/rtl/; + } + {{ end }} + {{ if (eq $serviceName "bitcoin_thub") }} + location /thub/ { + rewrite ^/thub(.*)$ $1 break; + proxy_pass http://bitcoin_thub:3000/; } {{ end }} {{ if (eq $serviceName "btcqbo") }} diff --git a/README.md b/README.md index 136d06d..3ea653d 100644 --- a/README.md +++ b/README.md @@ -166,6 +166,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [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://github.com/btcpayserver/btcpayserver-doc/blob/master/ElectrumPersonalServer.md) for details). * [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-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). You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file). @@ -354,6 +355,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | 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) | +| apotdevin/thunderhub | v0.3.9 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.3.9/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.6-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-3/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) | | traefik | latest | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index c23f20a..69a2382 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -544,6 +544,12 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = $"v{image.Tag.Split('-')[0]}"; dockerInfo.SupportedByUs = true; break; + case "thunderhub": + dockerInfo.DockerFilePath = $"Dockerfile"; + dockerInfo.GitLink = "https://github.com/apotdevin/thunderhub"; + dockerInfo.GitRef = $"{image.Tag.Split('-')[0]}"; + dockerInfo.SupportedByUs = false; + break; default: if (firstTry) { diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 188f14a..3326811 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -639,6 +639,18 @@ docker build -f "$DOCKERFILE" -t "pihole/pihole:v4.4" . cd - && cd .. +# Build thunderhub +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.3.9/Dockerfile +DOCKERFILE="Dockerfile" +echo "Building apotdevin/thunderhub:v0.3.9" +git clone https://github.com/apotdevin/thunderhub thunderhub +cd thunderhub +git checkout v0.3.9 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.3.9" . +cd - && cd .. + + # Build docker-gen # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" diff --git a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml new file mode 100644 index 0000000..32452be --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml @@ -0,0 +1,15 @@ +version: "3" +services: + btcpayserver: + environment: + BTCPAY_EXTERNALSERVICES: "Thunderhub:thub;" + bitcoin_thub: + image: apotdevin/thunderhub:v0.3.9 + restart: unless-stopped + environment: + BASE_PATH: "/thub" + HODL_KEY: "XQ86AOqw7Of8qMDql901mcZkuHL2nRel5FA9H2Ie4rTLeBKn0VlO5GuXvdVRogWrDOuH5V0E51Qxy9Bo" + expose: + - "3000" +required: + - "bitcoin-lnd"