From d211d8c467d8c2e31df11b543005e20007005a75 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 2 May 2020 06:33:27 +0900 Subject: [PATCH] Revert "Bump Tor" This reverts commit 5ea9f8c1d0557b28b01e623c3cbf71e968242732. --- contrib/build-all-images.sh | 18 +++++++++--------- .../docker-fragments/opt-add-tor-relay.yml | 2 +- .../docker-fragments/opt-add-tor.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e83ea07..549f34f 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -684,18 +684,18 @@ cd - && cd .. # Build tor -# 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" +# 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" git clone https://github.com/btcpayserver/dockerfile-deps tor cd tor -git checkout Tor/0.4.2.7 +git checkout Tor/0.4.1.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.2.7" . +docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.1.5" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml index e7f00a0..548cdef 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml @@ -17,7 +17,7 @@ services: tor-relay: restart: unless-stopped - image: btcpayserver/tor:0.4.2.7 + image: btcpayserver/tor:0.4.1.5 container_name: tor-relay environment: TOR_PASSWORD: btcpayserver diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index 3351169..6a22b28 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor.yml @@ -69,7 +69,7 @@ services: tor: restart: unless-stopped - image: btcpayserver/tor:0.4.2.7 + image: btcpayserver/tor:0.4.1.5 container_name: tor environment: TOR_PASSWORD: btcpayserver