From cc658a9a9e1ead3b9c7117854d0ab14146b55b97 Mon Sep 17 00:00:00 2001 From: d11n Date: Thu, 11 May 2023 09:31:56 +0200 Subject: [PATCH] Upgrade Lightning Terminal to v0.9.2 (#781) * Upgrade Lightning Terminal to v0.9.2 * Fix LiT datadir Closes #787. * nginx: Fix LiT location --- Production/nginx.tmpl | 2 +- README.md | 2 +- contrib/build-all-images.sh | 14 ++++++-------- .../opt-add-lightning-terminal.yml | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 729321b..2be489a 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -146,7 +146,7 @@ {{ end }} {{ if (eq $serviceName "lnd_lit") }} - location /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; diff --git a/README.md b/README.md index 41b45fc..98120fe 100644 --- a/README.md +++ b/README.md @@ -390,7 +390,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | podcastindexorg/podcasting20-helipad | v0.1.10 | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.10/umbrel/Dockerfile) | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.10/umbrel/Dockerfile) | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.10/umbrel/Dockerfile) | [Github](https://github.com/Podcastindex-org/helipad) - [DockerHub](https://hub.docker.com/r/podcastindexorg/podcasting20-helipad) | | 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.8.6-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.8.6-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.8.6-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | +| lightninglabs/lightning-terminal | v0.9.2-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.9.2-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.9.2-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | mempool/frontend | 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) | | mempool/backend | v2.5.0-dev1 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/backend) | | mariadb | 10.5.8 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.5/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 6b4ebf3..e656696 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -709,7 +709,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 .. @@ -772,16 +772,16 @@ cd - && cd .. # Build lightning-terminal -# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.8.6-alpha/Dockerfile +# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.9.2-alpha/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.8.6-alpha/Dockerfile +# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.9.2-alpha/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building lightninglabs/lightning-terminal:v0.8.6-alpha-path-prefix" +echo "Building lightninglabs/lightning-terminal:v0.9.2-alpha-path-prefix" git clone https://github.com/lightninglabs/lightning-terminal lightning-terminal cd lightning-terminal -git checkout v0.8.6-alpha +git checkout v0.9.2-alpha cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.8.6-alpha-path-prefix" . +docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.9.2-alpha-path-prefix" . cd - && cd .. @@ -1209,5 +1209,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-lightning-terminal.yml b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml index f8d549b..508f8be 100644 --- a/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml +++ b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml @@ -8,12 +8,12 @@ services: LND_EXTRA_ARGS: | rpcmiddleware.enable=true lnd_lit: - image: "lightninglabs/lightning-terminal:v0.8.6-alpha-path-prefix" + image: "lightninglabs/lightning-terminal:v0.9.2-alpha-path-prefix" restart: unless-stopped expose: - "8080" volumes: - - "lnd_lit_datadir:/root/.lnd" + - "lnd_lit_datadir:/root/.lit" - "lnd_bitcoin_datadir:/data/lnd:ro" links: - bitcoind