From d6b19373c58f32a0052787f7c66c78db30e81a3f Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 9 Aug 2022 11:23:46 +0200 Subject: [PATCH] Update LNDhub to v1.4.1 --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 4 +++- contrib/build-all-images.sh | 10 ++++------ .../docker-fragments/opt-add-bluewallet-lndhub.yml | 7 ++----- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f1e985e..2aeb567 100644 --- a/README.md +++ b/README.md @@ -380,7 +380,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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) | | btcpayserver/monero | 0.18.0.0-amd64 | [✔️](https://github.com/btcpayserver/dockerfile-deps/blob/master/Monero/0.18.0.0/linuxamd64.Dockerfile) | ️❌ | [✔️](https://github.com/btcpayserver/dockerfile-deps/blob/master/Monero/0.18.0.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | 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.3.3 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | +| 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) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | shesek/bwt | 0.2.2-electrum | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm64v8.Dockerfile) | [Github](https://github.com/bwt-dev/bwt) - [DockerHub](https://hub.docker.com/r/shesek/bwt) | | chatwoot/chatwoot | v1.7.0 | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | [Github](https://github.com/chatwoot/chatwoot) - [DockerHub](https://hub.docker.com/r/chatwoot/chatwoot) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 1c7add7..7096f35 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Collections.Generic; using System.IO; @@ -650,8 +650,10 @@ namespace DockerFileBuildHelper case "lndhub": dockerInfo.DockerFilePath = $"Dockerfile"; dockerInfo.DockerFilePathARM32v7 = $"Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; dockerInfo.GitLink = "https://github.com/BlueWallet/LndHub"; dockerInfo.GitRef = $"{image.Tag.Split("@")[0]}"; + dockerInfo.SupportedByUs = false; break; case "fireflyiii/core": dockerInfo.DockerFilePath = $"Dockerfile"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index b433360..f1d3b41 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -540,16 +540,14 @@ cd - && cd .. # Build lndhub -# https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile +# https://raw.githubusercontent.com/BlueWallet/LndHub/v1.4.1/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" -echo "Building bluewalletorganization/lndhub:v1.3.3" +echo "Building bluewalletorganization/lndhub:v1.4.1" git clone https://github.com/BlueWallet/LndHub lndhub cd lndhub -git checkout v1.3.3 +git checkout v1.4.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "bluewalletorganization/lndhub:v1.3.3" . +docker build -f "$DOCKERFILE" -t "bluewalletorganization/lndhub:v1.4.1" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml b/docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml index f84e2fa..d3f67da 100644 --- a/docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml +++ b/docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml @@ -10,10 +10,9 @@ services: volumes: - "bluewallet_lndhub_redisdir:/data" - bluewallet_lndhub_app: container_name: bluewallet_lndhub_app - image: "bluewalletorganization/lndhub:v1.3.3@sha256:b99408dfb53f503def405668f5fc4d8185de39a87843d4ea8774544a5df1fe36" + image: "bluewalletorganization/lndhub:v1.4.1" user: "0:0" depends_on: [ "bluewallet_lndhub_redis" ] restart: "on-failure" @@ -22,12 +21,10 @@ services: - "lnd_bitcoin_datadir:/lnd:ro" environment: PORT: "3000" - #TOR_URL: "${APP_HIDDEN_SERVICE}" LND_CERT_FILE: "/lnd/tls.cert" LND_ADMIN_MACAROON_FILE: "/lnd/admin.macaroon" CONFIG: '{ "rateLimit": 10000, "postRateLimit": 10000, "redis": { "port": 6379, "host": "bluewallet_lndhub_redis", "family": 4, "password": "S7bk49NBp29khUci4Zw28vsBviCnYfZ2QLTEsQNizq9ni5ur", "db": 0 }, "lnd": { "url": "lnd_bitcoin:10009", "password": ""}}' - btcpayserver: environment: BTCPAY_EXTERNALSERVICES: "Blue Wallet LNDHub:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/bluewallet_lndhub_app;" @@ -37,4 +34,4 @@ volumes: bluewallet_lndhub_redisdir: required: - - "bitcoin-lnd" \ No newline at end of file + - "bitcoin-lnd"