From 22a635a7f3e420b3461afd271e34000ed6f1674e Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Thu, 20 Oct 2022 13:28:50 +0200 Subject: [PATCH] Upgrade Tallycoin Connect Also switches to the official image. @djbooth007 is now the source for the Docker images, which up to now I maintained for my fork. --- README.md | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 2 +- contrib/build-all-images.sh | 18 ++++++++---------- .../opt-add-tallycoin-connect.yml | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index c6927e8..4187862 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [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-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/djbooth007/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). * [opt-add-teos](docker-compose-generator/docker-fragments/opt-add-teos.yml) for [The Eye Of Satoshi](https://github.com/talaia-labs/python-teos), a BOLT13 Lightning Watchtower. Use port 9814 on your server or Tor to connect. * [opt-add-chatwoot](docker-compose-generator/docker-fragments/opt-add-chatwoot.yml) for open source chat support system. ([See the documentation](docs/chatwoot.md)) @@ -393,7 +393,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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.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) | +| djbooth007/tallycoin_connect | v1.7.5 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/djbooth007/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) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index ec9215b..9b3100d 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -294,7 +294,7 @@ namespace DockerFileBuildHelper dockerInfo.DockerFilePath = "Dockerfile"; dockerInfo.DockerFilePathARM32v7 = $"Dockerfile.arm32v7"; dockerInfo.DockerFilePathARM64v8 = $"Dockerfile.arm64v8"; - dockerInfo.GitLink = "https://github.com/dennisreimann/tallycoin_connect"; + dockerInfo.GitLink = "https://github.com/djbooth007/tallycoin_connect"; dockerInfo.GitRef = $"{image.Tag}"; dockerInfo.SupportedByUs = false; break; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ec9c20a..5c801e1 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -741,7 +741,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 .. @@ -882,18 +882,18 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile +# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.3/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building dennisreimann/tallycoin_connect:v1.7.3" -git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect +echo "Building djbooth007/tallycoin_connect:v1.7.5" +git clone https://github.com/djbooth007/tallycoin_connect tallycoin_connect cd tallycoin_connect -git checkout v1.7.3 +git checkout v1.7.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.3" . +docker build -f "$DOCKERFILE" -t "djbooth007/tallycoin_connect:v1.7.5" . cd - && cd .. @@ -1165,5 +1165,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-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml index eab34a6..9eaaeb6 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -6,7 +6,7 @@ services: volumes: - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" tallycoin_connect: - image: "dennisreimann/tallycoin_connect:v1.7.3" + image: "djbooth007/tallycoin_connect:v1.7.5" restart: unless-stopped expose: - "8123"