Add Lightning Terminal fragment (#512)

* Add Lightning Terminal fragment * Remove mappings and variables * Version update * Update contrib/build-all-images.sh Co-authored-by: Oliver Gugger <gugger@gmail.com> * Update docker version * Add Lightning Terminal to fragments list * Upgrade LiT to v0.6.0 Co-authored-by: Oliver Gugger <gugger@gmail.com>
2021-12-01 12:38:02 +01:00
parent 8b07b2b47d
commit 3d6d2a81db
5 changed files with 83 additions and 10 deletions
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -1,4 +1,4 @@
-{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }} 
+{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }}
 {{ define "upstream" }}
 	{{ if .Address }}
 		{{/* If we got the containers from swarm and this container's port is published to host, use host IP:PORT */}}
@@ -18,7 +18,7 @@
 	server 127.0.0.1 down;
 		{{ end }}
 	{{ end }}
-	
+
 {{ end }}

 {{ define "redirects" }}
@@ -69,7 +69,7 @@
 	location /lightning-charge/btc/ {
 		proxy_pass http://clightning_bitcoin_charge:9112/;
 	}
-	{{ end }}		
+	{{ end }}
 	{{ if (eq $serviceName "clightning_bitcoin_rest") }}
 	location /clightning-rest/btc/ {
 	    rewrite ^/clightning-rest/btc/(.*) /$1 break;
@@ -86,7 +86,7 @@
 		proxy_pass http://clightning_groestlcoin_charge:9112/;
 	}
 		{{ end }}
-		
+
 		{{ if (eq $serviceName "btctransmuter") }}
 	location /btctransmuter/ {
 		proxy_set_header Connection "";
@@ -110,7 +110,28 @@
 	}
 		{{ end }}

-		
+  {{ if (eq $serviceName "lnd_lit") }}
+  location /lit {
+    proxy_set_header Host               $host;
+    proxy_set_header X-Real-IP          $remote_addr;
+    proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto  $scheme;
+    proxy_pass http://lnd_lit:8080/;
+  }
+
+	location ~* ^/lnrpc.Lightning/ {
+    proxy_pass http://lnd_lit:8080;
+  }
+
+  location ~* ^/looprpc.SwapClient/ {
+    proxy_pass http://lnd_lit:8080;
+  }
+
+  location ~* ^/poolrpc.Trader/ {
+    proxy_pass http://lnd_lit:8080;
+  }
+  {{ end }}
+
  {{ if (eq $serviceName "sphinxrelay") }}
  location /sphinxrelay/ {
    proxy_set_header        Host               $host;
@@ -597,4 +618,4 @@ server {
 {{ end }}
 {{ if $.Env.ADDITIONAL_NGINX_CONFIG }}
 {{ $.Env.ADDITIONAL_NGINX_CONFIG}}
-{{ end }}
+{{ end }}
--- a/README.md
+++ b/README.md
@@ -176,6 +176,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are:
 * [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-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).
@@ -383,6 +384,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | 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) |
 | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) |
 | dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) |
+| lightninglabs/lightning-terminal | v0.6.0-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) |
 | 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.12.31 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
 | btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) |
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -283,6 +283,13 @@ namespace DockerFileBuildHelper
                    dockerInfo.GitRef = $"{image.Tag}";
                    dockerInfo.SupportedByUs = false;
                    break;
+                case "lnd_lit":
+                    dockerInfo.DockerFilePath = "Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = $"Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/lightninglabs/lightning-terminal";
+                    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";
@@ -658,7 +665,7 @@ namespace DockerFileBuildHelper
                    dockerInfo.DockerFilePathARM64v8 = $"Dockerfile";
                    dockerInfo.GitLink = "https://dev.azure.com/Firefly-III/_git/MainImage";
                    dockerInfo.RawLink = "https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true";
-                    
+
                    dockerInfo.GitRef = null;
                    break;
                default:
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -719,7 +719,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 ..
@@ -827,6 +827,18 @@ docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" .
 cd - && cd ..


+# Build lightning-terminal
+# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile
+DOCKERFILE="Dockerfile"
+echo "Building lightninglabs/lightning-terminal/v0.6.0-alpha-path-prefix"
+git clone https://github.com/lightninglabs/lightning-terminal.git lightning-terminal
+cd lightning-terminal
+git checkout v0.6.0-alpha
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" .
+cd - && cd ..
+
+
 # Build python-teos
 # https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile
 DOCKERFILE="docker/Dockerfile"
@@ -1093,5 +1105,3 @@ git checkout master
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" .
 cd - && cd ..
-
-
--- a/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml
@@ -0,0 +1,33 @@
+version: "3"
+services:
+  btcpayserver:
+    environment:
+      BTCPAY_EXTERNALSERVICES: "Lightning Terminal:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lit/;"
+  lnd_lit:
+    image: "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix"
+    restart: unless-stopped
+    expose:
+      - "8080"
+    volumes:
+      - "lnd_lit_datadir:/data/lit"
+      - "lnd_bitcoin_datadir:/data/lnd:ro"
+    links:
+      - bitcoind
+      - lnd_bitcoin
+    command:
+      - "--insecure-httplisten=0.0.0.0:8080"
+      - "--network=${NBITCOIN_NETWORK}"
+      - "--uipassword=${LIT_PASSWD}"
+      - "--lnd-mode=remote"
+      - "--remote.lnd.rpcserver=lnd_bitcoin:10009"
+      - "--remote.lnd.macaroonpath=/data/lnd/admin.macaroon"
+      - "--remote.lnd.tlscertpath=/data/lnd/tls.cert"
+      - "--faraday.connect_bitcoin"
+      - "--faraday.bitcoin.host=bitcoind:43782"
+      - "--faraday.bitcoin.user=lnd"
+      - "--faraday.bitcoin.password=afixedpasswordbecauselndsuckswithcookiefile"
+volumes:
+  lnd_lit_datadir:
+required:
+  - "bitcoin-lnd"
+  - "opt-lnd-grpc"