From bb5e60e5c06ea71ee2acad5a04d0bc0bd65c0c37 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 9 Aug 2022 11:25:07 +0200 Subject: [PATCH] Update Sphinx Relay to v2.2.9 --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 5 +++-- contrib/build-all-images.sh | 10 ++++------ .../docker-fragments/opt-add-sphinxrelay.yml | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 65a3ba0..a7296c4 100644 --- a/README.md +++ b/README.md @@ -391,7 +391,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) | | 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 d94ef1e..9d58061 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; @@ -642,10 +642,11 @@ 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"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 9afec19..cca6572 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -844,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-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: