diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index fbc0afe0..bb7764ad 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -161,12 +161,6 @@ } {{ end }} - {{ if (eq $serviceName "torq") }} - location /torq/ { - proxy_pass http://torq:8080/; - } - {{ end }} - {{ if (eq $serviceName "sphinxrelay") }} location /sphinxrelay/ { proxy_set_header Host $host; diff --git a/README.md b/README.md index 016df639..f1185ce4 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,6 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-helipad](docker-compose-generator/docker-fragments/opt-add-helipad.yml) for [Podcastindex.org Helipad](https://github.com/Podcastindex-org/helipad). Requires LND. * [opt-add-nostr-relay](docker-compose-generator/docker-fragments/opt-add-nostr-relay.yml) for [Nostr Relay](https://github.com/kukks/Nnostr). * [opt-add-cloudflared](docker-compose-generator/docker-fragments/opt-add-cloudflared.yml) to expose your local server on clearnet painlessly ([see documentation](docs/cloudflare-tunnel.md)). -* [opt-add-torq](docker-compose-generator/docker-fragments/opt-add-torq.yml) to install [Torq](https://github.com/lncapital/torq) node management application. Requires LND. * [opt-add-snapdrop](docker-compose-generator/docker-fragments/opt-add-snapdrop.yml) to install [Snapdrop](https://snapdrop.net/). You can then browse to `/snapdrop` of your server to access it. * [opt-add-ltcmweb](docker-compose-generator/docker-fragments/opt-add-ltcmweb.yml) to add the support service for the Litecoin MWEB payment method plugin. * [opt-add-shopify](docker-compose-generator/docker-fragments/opt-add-shopify.yml) to install the [Shopify App Deployer](https://github.com/btcpayserver/shopify-app). Used by the [BTCPay Server Shopify plugin](https://github.com/btcpayserver/btcpayserver-shopify-plugin). @@ -412,7 +411,6 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | djbooth007/tallycoin_connect | v1.8.0 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.8.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.8.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.8.0/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/djbooth007/tallycoin_connect) | | benjaminchodroff/rust-teos | latest | [✔️](https://raw.githubusercontent.com/benjaminchodroff/rust-teos/master/docker/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/benjaminchodroff/rust-teos) - [DockerHub](https://hub.docker.com/r/benjaminchodroff/rust-teos) | | apotdevin/thunderhub | base-0.15.4 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.15.4/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.15.4/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.15.4/Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | -| lncapital/torq | 0.20.3 | [✔️](https://raw.githubusercontent.com/lncapital/torq/master/README.md) | [✔️](https://raw.githubusercontent.com/lncapital/torq/master/README.md) | [✔️](https://raw.githubusercontent.com/lncapital/torq/master/README.md) | [Github](https://github.com/lncapital/torq) - [DockerHub](https://hub.docker.com/r/lncapital/torq) | | timescale/timescaledb | latest-pg14 | [✔️](https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile) | [✔️](https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile) | [✔️](https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile) | [Github](https://github.com/timescale/timescaledb-docker) - [DockerHub](https://hub.docker.com/r/timescale/timescaledb) | | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | | memcached | 1.5.22-alpine | [✔️](https://raw.githubusercontent.com/docker-library/memcached/eb38bf28263b8e5bb7367797cb7b181b65d769bd/alpine/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/memcached) - [DockerHub](https://hub.docker.com/_/memcached) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 7f624b0e..0b1cef82 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -788,13 +788,6 @@ namespace DockerFileBuildHelper dockerInfo.GitLink = "https://github.com/mempool/mempool"; dockerInfo.GitRef = image.Tag; break; - case "lncapital/torq": - dockerInfo.DockerFilePath = $"README.md"; - dockerInfo.DockerFilePathARM32v7 = $"README.md"; - dockerInfo.DockerFilePathARM64v8 = $"README.md"; - dockerInfo.GitLink = "https://github.com/lncapital/torq"; - dockerInfo.GitRef = "master"; // they deleted old tags... - break; case "timescale/timescaledb": dockerInfo.DockerFilePath = $"Dockerfile"; dockerInfo.DockerFilePathARM32v7 = $"Dockerfile"; diff --git a/contrib/DockerFileBuildHelper/build-all.sh b/contrib/DockerFileBuildHelper/build-all.sh index 09ebc99c..5d9f2cf2 100644 --- a/contrib/DockerFileBuildHelper/build-all.sh +++ b/contrib/DockerFileBuildHelper/build-all.sh @@ -977,22 +977,6 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.10.7" . cd - && cd .. -# Build torq -# https://raw.githubusercontent.com/lncapital/torq/master/README.md -DOCKERFILE="README.md" -# https://raw.githubusercontent.com/lncapital/torq/master/README.md -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="README.md" -# https://raw.githubusercontent.com/lncapital/torq/master/README.md -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="README.md" -echo "Building lncapital/torq:0.20.3" -git clone https://github.com/lncapital/torq torq -cd torq -git checkout master -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "lncapital/torq:0.20.3" . -cd - && cd .. - - # Build timescaledb # https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile DOCKERFILE="Dockerfile" diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index d7e93396..78cac05f 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -1013,22 +1013,6 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.10.7" . cd - && cd .. -# Build torq -# https://raw.githubusercontent.com/lncapital/torq/master/README.md -DOCKERFILE="README.md" -# https://raw.githubusercontent.com/lncapital/torq/master/README.md -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="README.md" -# https://raw.githubusercontent.com/lncapital/torq/master/README.md -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="README.md" -echo "Building lncapital/torq:0.20.3" -git clone https://github.com/lncapital/torq torq -cd torq -git checkout master -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "lncapital/torq:0.20.3" . -cd - && cd .. - - # Build timescaledb # https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile DOCKERFILE="Dockerfile" diff --git a/docker-compose-generator/docker-fragments/opt-add-torq.yml b/docker-compose-generator/docker-fragments/opt-add-torq.yml deleted file mode 100644 index 5847bbd5..00000000 --- a/docker-compose-generator/docker-fragments/opt-add-torq.yml +++ /dev/null @@ -1,45 +0,0 @@ -services: - torq: - user: "root:root" - image: "lncapital/torq:0.20.3" - restart: unless-stopped - depends_on: - - "torq_db" - command: - - --db.host - - torq_db - - --db.password - - torq_db_password - - --lnd.url - - lnd_bitcoin:10009 - - --lnd.macaroon-path - - /lnd/admin.macaroon - - --lnd.tls-path - - /lnd/tls.cert - - --torq.cookie-path - - /data/.cookie - - start - volumes: - - "lnd_bitcoin_datadir:/lnd:ro" - - "lnd_bitcoin_torq_datadir:/data" - links: - - lnd_bitcoin - torq_db: - image: "timescale/timescaledb:latest-pg14" - environment: - POSTGRES_PASSWORD: torq_db_password - volumes: - - torq_datadir:/var/lib/postgresql/data - - btcpayserver: - environment: - BTCPAY_BTCEXTERNALTORQ: "server=/torq/cookie-login;cookiefile=/etc/lnd_bitcoin_torq/.cookie" - volumes: - - "lnd_bitcoin_torq_datadir:/etc/lnd_bitcoin_torq" - -volumes: - torq_datadir: - lnd_bitcoin_torq_datadir: -required: - - "bitcoin-lnd" - - "opt-lnd-grpc"