AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Revert "Update tor"

Browse Source 
This reverts commit 365e990740.
This commit is contained in:
nicolas.dorier
2021-06-15 11:59:43 +09:00
parent 365e990740
commit a7701414d3
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,7 +314,7 @@ cd - && cd ..
# Build lightning # Build lightning
# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile # https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile
DOCKERFILE="Dockerfile" DOCKERFILE="Dockerfile"
echo "Building groestlcoin/lightning:v0.10.0" echo "Building groestlcoin/lightning:v0.10.0"
git clone https://github.com/Groestlcoin/lightning lightning git clone https://github.com/Groestlcoin/lightning lightning
@@ -808,18 +808,18 @@ cd - && cd ..
# Build tor # Build tor
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxamd64.Dockerfile # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile
DOCKERFILE="Tor/0.4.6.5/linuxamd64.Dockerfile" DOCKERFILE="Tor/0.4.4.7/linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm64v8.Dockerfile # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm64v8.Dockerfile" [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm64v8.Dockerfile"
echo "Building btcpayserver/tor:0.4.6.5" echo "Building btcpayserver/tor:0.4.4.7"
git clone https://github.com/btcpayserver/dockerfile-deps tor git clone https://github.com/btcpayserver/dockerfile-deps tor
cd tor cd tor
git checkout Tor/0.4.6.5 git checkout Tor/0.4.4.7
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.6.5" . docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.4.7" .
cd - && cd .. cd - && cd ..
@@ -1009,5 +1009,3 @@ git checkout master
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" .
cd - && cd .. cd - && cd ..

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

@@ -69,7 +69,7 @@ services:
tor: tor:
restart: unless-stopped restart: unless-stopped
image: btcpayserver/tor:0.4.6.5 image: btcpayserver/tor:0.4.4.7
container_name: tor container_name: tor
environment: environment:
TOR_PASSWORD: btcpayserver TOR_PASSWORD: btcpayserver