diff --git a/README.md b/README.md index f1e985e..a7296c4 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) | @@ -389,9 +389,9 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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.6.3-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.3-alpha/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | +| lightninglabs/lightning-terminal | v0.6.7-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.7-alpha/Dockerfile) | ️❌ | ️[✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.7-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | kukks/nnostr-relay | v0.0.7 | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.7/Relay/Dockerfile) | [Github](https://github.com/kukks/nnostr) - [DockerHub](https://hub.docker.com/r/kukks/nnostr-relay) | -| sphinxlightning/sphinx-relay | v2.2.5 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.5/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.5/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | +| sphinxlightning/sphinx-relay | v2.2.9 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile)| [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | dennisreimann/tallycoin_connect | v1.7.3 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | 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.13.11 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 1c7add7..9d58061 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -642,16 +642,19 @@ namespace DockerFileBuildHelper break; case "sphinx-relay": dockerInfo.DockerFilePath = $"Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"Dockerfile"; dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; dockerInfo.GitLink = "https://github.com/stakwork/sphinx-relay"; dockerInfo.GitRef = $"{image.Tag}"; + dockerInfo.SupportedByUs = false; break; 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"; @@ -664,6 +667,7 @@ namespace DockerFileBuildHelper case "lightninglabs/lightning-terminal": dockerInfo.GitLink = "https://github.com/lightninglabs/lightning-terminal"; dockerInfo.DockerFilePath = $"Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; dockerInfo.GitRef = image.Tag.Replace("-path-prefix", ""); break; case "chatwoot/chatwoot": diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index b433360..cca6572 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 .. @@ -786,14 +784,14 @@ cd - && cd .. # Build lightning-terminal -# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.3-alpha/Dockerfile +# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.7-alpha/Dockerfile DOCKERFILE="Dockerfile" -echo "Building lightninglabs/lightning-terminal:v0.6.3-alpha-path-prefix" +echo "Building lightninglabs/lightning-terminal:v0.6.7-alpha-path-prefix" git clone https://github.com/lightninglabs/lightning-terminal lightning-terminal cd lightning-terminal -git checkout v0.6.3-alpha +git checkout v0.6.7-alpha cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.3-alpha-path-prefix" . +docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.7-alpha-path-prefix" . cd - && cd .. @@ -846,16 +844,14 @@ cd - && cd .. # Build sphinx-relay -# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.5/Dockerfile +# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.5/Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building sphinxlightning/sphinx-relay:v2.2.5" +echo "Building sphinxlightning/sphinx-relay:v2.2.9" git clone https://github.com/stakwork/sphinx-relay sphinx-relay cd sphinx-relay -git checkout v2.2.5 +git checkout v2.2.9 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.2.5" . +docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.2.9" . 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" 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 a0665a8..a521577 100644 --- a/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml +++ b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml @@ -4,7 +4,7 @@ services: environment: BTCPAY_EXTERNALSERVICES: "Lightning Terminal:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lit/;" lnd_lit: - image: "lightninglabs/lightning-terminal:v0.6.3-alpha-path-prefix" + image: "lightninglabs/lightning-terminal:v0.6.7-alpha-path-prefix" restart: unless-stopped expose: - "8080" diff --git a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml index 383adb7..ecddfb7 100644 --- a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml @@ -6,7 +6,7 @@ services: volumes: - "sphinxrelay_datadir:/etc/sphinxrelay_datadir" sphinxrelay: - image: "sphinxlightning/sphinx-relay:v2.2.5" + image: "sphinxlightning/sphinx-relay:v2.2.9" user: "0:0" restart: unless-stopped expose: