From 365e990740aaa0e65f194df71bfad88456bde844 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 15 Jun 2021 11:58:05 +0900 Subject: [PATCH] Update tor --- contrib/build-all-images.sh | 22 ++++++++++--------- .../docker-fragments/opt-add-tor.yml | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e6048f7..aa17c9a 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -314,7 +314,7 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile DOCKERFILE="Dockerfile" echo "Building groestlcoin/lightning:v0.10.0" git clone https://github.com/Groestlcoin/lightning lightning @@ -808,18 +808,18 @@ cd - && cd .. # Build tor -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile -DOCKERFILE="Tor/0.4.4.7/linuxamd64.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.4.7/linuxarm32v7.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.4.7/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/tor:0.4.4.7" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxamd64.Dockerfile +DOCKERFILE="Tor/0.4.6.5/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/tor:0.4.6.5" git clone https://github.com/btcpayserver/dockerfile-deps tor cd tor -git checkout Tor/0.4.4.7 +git checkout Tor/0.4.6.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.4.7" . +docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.6.5" . cd - && cd .. @@ -1009,3 +1009,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index d7db83d..91a7a38 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.4.7 + image: btcpayserver/tor:0.4.6.5 container_name: tor environment: TOR_PASSWORD: btcpayserver