AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Revert "Revert "Bump Tor""

Browse Source 
This reverts commit d211d8c467.
This commit is contained in:
nicolas.dorier
2020-05-02 06:46:06 +09:00
parent d211d8c467
commit 18214dbbce
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -684,18 +684,18 @@ cd - && cd ..
# Build tor
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxamd64.Dockerfile
DOCKERFILE="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
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="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
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.1.5/linuxarm64v8.Dockerfile"
echo "Building btcpayserver/tor:0.4.1.5"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxamd64.Dockerfile
DOCKERFILE="Tor/0.4.2.7/linuxamd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.2.7/linuxarm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxarm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.2.7/linuxarm64v8.Dockerfile"
echo "Building btcpayserver/tor:0.4.2.7"
git clone https://github.com/btcpayserver/dockerfile-deps tor
cd tor
git checkout Tor/0.4.1.5
git checkout Tor/0.4.2.7
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.1.5" .
docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.2.7" .
cd - && cd ..

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

@@ -17,7 +17,7 @@ services:
tor-relay:
restart: unless-stopped
image: btcpayserver/tor:0.4.1.5
image: btcpayserver/tor:0.4.2.7
container_name: tor-relay
environment:
TOR_PASSWORD: btcpayserver

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

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