lukechilds
/
btcpayserver-docker
mirror of https://github.com/lukechilds/btcpayserver-docker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Expose RPC via Tor

feature/lndseedbackup
nicolas.dorier 5 years ago
parent
1622d3777f
commit
3c1296ba01
No known key found for this signature in database GPG Key ID: 6618763EF09186FE
6 changed files with 38 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Generated/torrc.tmpl
  2. 2
      README.md
  3. 44
      contrib/build-all-images.sh
  4. 2
      docker-compose-generator/docker-fragments/nginx.yml
  5. 2
      docker-compose-generator/docker-fragments/opt-add-tor-relay.yml
  6. 15
      docker-compose-generator/docker-fragments/opt-add-tor.yml

4
Generated/torrc.tmpl
View File

@ -10,8 +10,8 @@
{{ range $reverseProxyContainer := where $ "Name" $containerOrReverseProxyName }} {{ range $reverseProxyContainer := where $ "Name" $containerOrReverseProxyName }}
{{ range $containerNetwork := where $reverseProxyContainer.Networks "Name" $knownNetwork.Name }} {{ range $containerNetwork := where $reverseProxyContainer.Networks "Name" $knownNetwork.Name }}
{{ $port := coalesce $container.Env.HIDDENSERVICE_PORT "80" }} {{ $port := coalesceempty (index $container.Env (print $name "_HIDDENSERVICE_PORT")) $container.Env.HIDDENSERVICE_PORT "80" }}
{{ $virtualPort := coalesce $container.Env.HIDDENSERVICE_VIRTUAL_PORT $port }} {{ $virtualPort := coalesceempty (index $container.Env (print $name "_HIDDENSERVICE_VIRTUAL_PORT")) $container.Env.HIDDENSERVICE_VIRTUAL_PORT $port }}
{{ if ne $containerNetwork.IP "" }} {{ if ne $containerNetwork.IP "" }}
{{ if $firstServicePort }} {{ if $firstServicePort }}
# For the hidden service {{ $name }} # For the hidden service {{ $name }}

2
README.md
View File

@ -314,7 +314,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
| btcpayserver/btcpayserver | 1.0.3.136 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.136/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.136/arm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/btcpayserver | 1.0.3.136 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.136/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.136/arm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
| nicolasdorier/nbxplorer | 2.0.0.62 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.62/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.62/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.62/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nicolasdorier/nbxplorer | 2.0.0.62 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.62/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.62/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.62/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
| nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) |
| btcpayserver/docker-gen | 0.7.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/docker-gen | 0.7.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) |
| btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) |
| btcpayserver/btctransmuter | 0.0.37 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.37/BtcTransmuter/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.37/BtcTransmuter/Dockerfile.linuxarm32v7) | ️❌ | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btctransmuter | 0.0.37 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.37/BtcTransmuter/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.37/BtcTransmuter/Dockerfile.linuxarm32v7) | ️❌ | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) |
| btcpayserver/tor | 0.4.1.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | | btcpayserver/tor | 0.4.1.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) |

44
contrib/build-all-images.sh
View File

@ -330,14 +330,14 @@ cd - && cd ..
# Build docker-monacoin # Build docker-monacoin
# https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.16.3/Dockerfile # https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile
DOCKERFILE="monacoin/0.16.3/Dockerfile" DOCKERFILE="monacoin/0.17.1/Dockerfile"
echo "Building wakiyamap/docker-monacoin:0.16.3" echo "Building wakiyamap/docker-monacoin:0.17.1"
git clone https://github.com/wakiyamap/docker-bitcoin docker-monacoin git clone https://github.com/wakiyamap/docker-bitcoin docker-monacoin
cd docker-monacoin cd docker-monacoin
git checkout master git checkout master
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "wakiyamap/docker-monacoin:0.16.3" . docker build -f "$DOCKERFILE" -t "wakiyamap/docker-monacoin:0.17.1" .
cd - && cd .. cd - && cd ..
@ -414,18 +414,18 @@ cd - && cd ..
# Build docker-gen # Build docker-gen
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxamd64.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxamd64.Dockerfile
DOCKERFILE="linuxamd64.Dockerfile" DOCKERFILE="linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm64v8.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile"
echo "Building btcpayserver/docker-gen:0.7.6" echo "Building btcpayserver/docker-gen:0.7.7"
git clone https://github.com/btcpayserver/docker-gen docker-gen git clone https://github.com/btcpayserver/docker-gen docker-gen
cd docker-gen cd docker-gen
git checkout v0.7.6 git checkout v0.7.7
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.6" . docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.7" .
cd - && cd .. cd - && cd ..
@ -492,18 +492,18 @@ cd - && cd ..
# Build docker-gen # Build docker-gen
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxamd64.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxamd64.Dockerfile
DOCKERFILE="linuxamd64.Dockerfile" DOCKERFILE="linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm64v8.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile"
echo "Building btcpayserver/docker-gen:0.7.6" echo "Building btcpayserver/docker-gen:0.7.7"
git clone https://github.com/btcpayserver/docker-gen docker-gen git clone https://github.com/btcpayserver/docker-gen docker-gen
cd docker-gen cd docker-gen
git checkout v0.7.6 git checkout v0.7.7
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.6" . docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.7" .
cd - && cd .. cd - && cd ..
@ -540,18 +540,18 @@ cd - && cd ..
# Build docker-gen # Build docker-gen
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxamd64.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxamd64.Dockerfile
DOCKERFILE="linuxamd64.Dockerfile" DOCKERFILE="linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm64v8.Dockerfile # https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile"
echo "Building btcpayserver/docker-gen:0.7.6" echo "Building btcpayserver/docker-gen:0.7.7"
git clone https://github.com/btcpayserver/docker-gen docker-gen git clone https://github.com/btcpayserver/docker-gen docker-gen
cd docker-gen cd docker-gen
git checkout v0.7.6 git checkout v0.7.7
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.6" . docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.7" .
cd - && cd .. cd - && cd ..

2
docker-compose-generator/docker-fragments/nginx.yml
View File

@ -13,7 +13,7 @@ services:
- "nginx_html:/usr/share/nginx/html" - "nginx_html:/usr/share/nginx/html"
nginx-gen: nginx-gen:
restart: unless-stopped restart: unless-stopped
image: btcpayserver/docker-gen:0.7.6 image: btcpayserver/docker-gen:0.7.7
container_name: nginx-gen container_name: nginx-gen
environment: environment:
DEFAULT_HOST: ${REVERSEPROXY_DEFAULT_HOST:-none} DEFAULT_HOST: ${REVERSEPROXY_DEFAULT_HOST:-none}

2
docker-compose-generator/docker-fragments/opt-add-tor-relay.yml
View File

@ -2,7 +2,7 @@ version: "3"
services: services:
tor-relay-gen: tor-relay-gen:
restart: unless-stopped restart: unless-stopped
image: btcpayserver/docker-gen:0.7.6 image: btcpayserver/docker-gen:0.7.7
container_name: tor-relay-gen container_name: tor-relay-gen
volumes: volumes:
- "/var/run/docker.sock:/tmp/docker.sock:ro" - "/var/run/docker.sock:/tmp/docker.sock:ro"

15
docker-compose-generator/docker-fragments/opt-add-tor.yml
View File

@ -35,11 +35,18 @@ services:
bitcoind: bitcoind:
environment: environment:
HIDDENSERVICE_NAME: BTC-P2P HIDDENSERVICE_NAME: BTC-P2P,BTC-RPC
HIDDENSERVICE_VIRTUAL_PORT: 8333 BTC-P2P_HIDDENSERVICE_VIRTUAL_PORT: 8333
HIDDENSERVICE_PORT: 39388 BTC-P2P_HIDDENSERVICE_PORT: 39388
BTC-RPC_HIDDENSERVICE_VIRTUAL_PORT: 8332
BTC-RPC_HIDDENSERVICE_PORT: 43782
BITCOIN_EXTRA_ARGS: | BITCOIN_EXTRA_ARGS: |
onion=tor:9050 onion=tor:9050
# rpcuser=btcrpc
# rpcpassword=btcpayserver4ever
# We need to use rpcauth because we also need cookieauth. rpcpassword disabled cookie file auth.
# Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped.
rpcauth=btcrpc:a6a5d29a3f44f02e4cd8cabb5b10a234$$ab6152915515f6a9cca806d2ab5f0e2794c346ba74f812c61e48241d523778b8
volumes: volumes:
- "tor_datadir:/home/tor/.tor" - "tor_datadir:/home/tor/.tor"
links: links:
@ -94,7 +101,7 @@ services:
tor-gen: tor-gen:
restart: unless-stopped restart: unless-stopped
image: btcpayserver/docker-gen:0.7.6 image: btcpayserver/docker-gen:0.7.7
container_name: tor-gen container_name: tor-gen
volumes: volumes:
- "/var/run/docker.sock:/tmp/docker.sock:ro" - "/var/run/docker.sock:/tmp/docker.sock:ro"

Write Preview
Loading…
Cancel
Save