diff --git a/README.md b/README.md index 1b2fe57..a99fa90 100644 --- a/README.md +++ b/README.md @@ -387,7 +387,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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) | | 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.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | -| dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| dennisreimann/tallycoin_connect | v1.7.2 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.2/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.2/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.6 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.6/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2252443..d9c5e51 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -854,18 +854,18 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.2/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.2/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.2/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building dennisreimann/tallycoin_connect:v1.7.0" +echo "Building dennisreimann/tallycoin_connect:v1.7.2" git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect cd tallycoin_connect -git checkout v1.7.0 +git checkout v1.7.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" . +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.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 bf0fead..481f665 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.0" + image: "dennisreimann/tallycoin_connect:v1.7.2" restart: unless-stopped expose: - "8123" @@ -17,6 +17,7 @@ services: PUBLIC_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/tallycoin-connect/ TALLYCOIN_APIKEY: "${TALLYCOIN_APIKEY}" TALLYCOIN_PASSWD: "${TALLYCOIN_PASSWD}" + TALLYCOIN_PASSWD_CLEARTEXT: "${TALLYCOIN_PASSWD_CLEARTEXT}" LND_SOCKET: "lnd_bitcoin:10009" LND_MACAROON_PATH: /tallycoin_connect/lnd/admin.macaroon LND_TLSCERT_PATH: /tallycoin_connect/lnd/tls.cert diff --git a/docs/tallycoin-connect.md b/docs/tallycoin-connect.md new file mode 100644 index 0000000..52da81b --- /dev/null +++ b/docs/tallycoin-connect.md @@ -0,0 +1,31 @@ +# Tallycoin Connect + +Set up [Tallycoin Connect](https://github.com/djbooth007/tallycoin_connect) on your BTCPay Server instance to allow for the retrieval of Lightning invoices via [Tallycoin](https://tallyco.in/). +LND required. + +## Installation + +To install the Tallycoin Connect service, you need to set your Tallycoin API key and a password first. +The password is optional, but as the service will be publicly available, you are strongly advised to require a secure password for the login. + +You can either set `TALLYCOIN_PASSWD_CLEARTEXT` (plain text) or `TALLYCOIN_PASSWD`, which must be a sha256 hash of your login password. + +```bash +# Set API key and password +export TALLYCOIN_APIKEY="my-tallycoin-api-key" +export TALLYCOIN_PASSWD_CLEARTEXT="sUpErSeCuRe" + +# Add fragment and run setup +BTCPAYGEN_ADDITIONAL_FRAGMENTS="$BTCPAYGEN_ADDITIONAL_FRAGMENTS;opt-add-tallycoin-connect" +. btcpay-setup.sh -i +``` + +Afterwards you should see Tallycoin Connect appear as a service on the Server Settings > Services page in BTCPay Server. + +## Troubleshooting + +To see the logs of the Tallycoin Connect service, you can run this command: + +```bash +docker logs -f generated_tallycoin_connect_1 +``` diff --git a/helpers.sh b/helpers.sh index 009e4c9..15eb697 100755 --- a/helpers.sh +++ b/helpers.sh @@ -109,7 +109,10 @@ TOR_RELAY_EMAIL=$TOR_RELAY_EMAIL EPS_XPUB=$EPS_XPUB LND_WTCLIENT_SWEEP_FEE=$LND_WTCLIENT_SWEEP_FEE FIREFLY_HOST=$FIREFLY_HOST -LIT_PASSWD=$LIT_PASSWD" > $BTCPAY_ENV_FILE +LIT_PASSWD=$LIT_PASSWD +TALLYCOIN_APIKEY=$TALLYCOIN_APIKEY +TALLYCOIN_PASSWD=$TALLYCOIN_PASSWD +TALLYCOIN_PASSWD_CLEARTEXT=$TALLYCOIN_PASSWD_CLEARTEXT" > $BTCPAY_ENV_FILE env | grep ^BWT_ >> $BTCPAY_ENV_FILE || true }