aljaz/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver-docker.git synced 2025-12-17 12:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rpc/hidden_service'

Browse Source
This commit is contained in:
nicolas.dorier
2019-11-07 20:47:23 +09:00
parent 1e426ba5d1 733e2e25b0
commit 267fd29d02
7 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
| btcpayserver/btcpayserver | 1.0.3.137 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.137/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.137/arm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/btcpayserver | 1.0.3.137 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.137/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.137/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) |

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

@@ -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 ..
@@ -504,18 +504,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 ..
@@ -552,18 +552,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 ..

6
docker-compose-generator/docker-fragments/bitcoin.yml
View File

@@ -4,20 +4,21 @@ services:
bitcoind: bitcoind:
restart: unless-stopped restart: unless-stopped
container_name: btcpayserver_bitcoind container_name: btcpayserver_bitcoind
image: btcpayserver/bitcoin:0.18.0 image: btcpayserver/bitcoin:0.18.0-1
environment: environment:
BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
BITCOIN_WALLETDIR: "/walletdata"
BITCOIN_EXTRA_ARGS: | BITCOIN_EXTRA_ARGS: |
rpcport=43782 rpcport=43782
rpcbind=0.0.0.0:43782 rpcbind=0.0.0.0:43782
port=39388 port=39388
disablewallet=1
whitelist=0.0.0.0/0 whitelist=0.0.0.0/0
expose: expose:
- "43782" - "43782"
- "39388" - "39388"
volumes: volumes:
- "bitcoin_datadir:/data" - "bitcoin_datadir:/data"
- "bitcoin_wallet_datadir:/walletdata"
nbxplorer: nbxplorer:
environment: environment:
NBXPLORER_CHAINS: "btc" NBXPLORER_CHAINS: "btc"
@@ -31,3 +32,4 @@ services:
BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/
volumes: volumes:
bitcoin_datadir: bitcoin_datadir:
bitcoin_wallet_datadir:

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"