From 4b7fffe0c7365f2091009b1c30154a25a2833fa7 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 8 Jun 2021 17:19:31 +0200 Subject: [PATCH] Add Tallycoin Connect fragment --- Production/nginx.tmpl | 10 +++++++ README.md | 2 ++ contrib/build-all-images.sh | 16 +++++++++++ .../docker-fragments/opt-add-sphinxrelay.yml | 4 +-- .../opt-add-tallycoin-connect.yml | 28 +++++++++++++++++++ .../docker-fragments/opt-lnd-grpc.yml | 6 ++++ 6 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml create mode 100644 docker-compose-generator/docker-fragments/opt-lnd-grpc.yml diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 6645d0b..db53287 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -112,6 +112,16 @@ proxy_set_header X-Forwarded-Proto $scheme; proxy_pass http://sphinxrelay:3300/; } + {{ end }} + + {{ if (eq $serviceName "tallycoin_connect") }} + location /tallycoin-connect/ { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://tallycoin_connect:8123/; + } {{ end }} {{ if (eq $serviceName "configurator") }} diff --git a/README.md b/README.md index bda07ba..db94af6 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-bluewallet-lndhub](docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml) for [Bluewallet LNDHub](https://github.com/BlueWallet/LndHub) - Use non-custodial LND Lightning directly from your Bluewallet, and freely let others open accounts on your node. Fragment maintained by [maltokyo](https://github.com/maltokyo). * [opt-add-ndlc](docker-compose-generator/docker-fragments/opt-add-ndlc.yml) ([See the documentation](docs/ndlc.md)) * [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/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-zammad](docker-compose-generator/docker-fragments/opt-add-zammad.yml) for [Zammad](https://zammad.com/features), a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails @@ -374,6 +375,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) | | sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | 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) | +| dennisreimann/tallycoin_connect | v1.0.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm64v8.Dockerfile) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | 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/build-all-images.sh b/contrib/build-all-images.sh index aa17c9a..c5a325d 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -743,6 +743,22 @@ docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.1.3" . cd - && cd .. +# Build tallycoin_connect +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" +echo "Building dennisreimann/tallycoin_connect:v1.0.0" +git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect +cd tallycoin_connect +git checkout v1.0.0 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.0.0" . +cd - && cd .. + + # Build python-teos # https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile DOCKERFILE="docker/Dockerfile" diff --git a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml index 23b1b88..935a1b0 100644 --- a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml @@ -5,9 +5,6 @@ services: BTCPAY_EXTERNALSERVICES: "Sphinx Relay:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/sphinxrelay/app;" volumes: - "sphinxrelay_datadir:/etc/sphinxrelay_datadir" - lnd_bitcoin: - expose: - - "10009" sphinxrelay: image: "sphinxlightning/sphinx-relay:v2.1.3@sha256:14b92d2376f12a0c9a1f8156b008795b1785983e9433b623c7cb8079f8c20b7f" user: "0:0" @@ -36,4 +33,5 @@ volumes: sphinxrelay_datadir: required: - "bitcoin-lnd" + - "opt-lnd-grpc" - "opt-lnd-keysend" diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml new file mode 100644 index 0000000..06f0ae2 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -0,0 +1,28 @@ +version: "3" +services: + btcpayserver: + environment: + BTCPAY_EXTERNALSERVICES: "Tallycoin Connect:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/tallycoin-connect/;" + volumes: + - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" + tallycoin_connect: + image: "dennisreimann/tallycoin_connect:v1.0.0@sha256:266cb62da9c7f81f97b1068bf40ba7e967009e1ff70f706f5363dcb6297197e6" + restart: unless-stopped + expose: + - "8123" + volumes: + - "tallycoin_connect_datadir:/tallycoin_connect" + - "lnd_bitcoin_datadir:/tallycoin_connect/lnd:ro" + environment: + PUBLIC_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/tallycoin-connect/ + TALLYCOIN_APIKEY: "${TALLYCOIN_APIKEY}" + LND_MACAROON_PATH: /tallycoin_connect/lnd/admin.macaroon + LND_TLSCERT_PATH: /tallycoin_connect/lnd/tls.cert + PORT: 8123 + links: + - lnd_bitcoin +volumes: + tallycoin_connect_datadir: +required: + - "bitcoin-lnd" + - "opt-lnd-grpc" diff --git a/docker-compose-generator/docker-fragments/opt-lnd-grpc.yml b/docker-compose-generator/docker-fragments/opt-lnd-grpc.yml new file mode 100644 index 0000000..0bec465 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-lnd-grpc.yml @@ -0,0 +1,6 @@ +version: "3" + +services: + lnd_bitcoin: + expose: + - "10009"