diff --git a/docker/my-dojo/tor/Dockerfile b/docker/my-dojo/tor/Dockerfile index 0d5d2e3..6e96b2a 100644 --- a/docker/my-dojo/tor/Dockerfile +++ b/docker/my-dojo/tor/Dockerfile @@ -1,11 +1,17 @@ FROM debian:stretch ENV TOR_HOME /var/lib/tor -ENV TOR_URL https://git.torproject.org/tor.git +ENV TOR_URL https://archive.torproject.org/tor-package-archive ENV TOR_VERSION 0.3.5.8 +ENV TOR_GPG_KEY1 0xEB5A896A28988BF5 +ENV TOR_GPG_KEY2 0xC218525819F78451 +ENV TOR_GPG_KEY3 0x21194EBB165733EA +ENV TOR_GPG_KEY4 0x6AFEE6D49E92B601 + ENV GOLANG_DL_URL https://dl.google.com/go ENV GOLANG_ARCHIVE go1.11.13.linux-amd64.tar.gz ENV GOLANG_SHA256 50fe8e13592f8cf22304b9c4adfc11849a2c3d281b1d7e09c924ae24874c6daa + ENV OBFS4_URL https://github.com/Yawning/obfs4.git ENV OBFS4_VERSION 0.0.11 @@ -13,19 +19,27 @@ ENV OBFS4_VERSION 0.0.11 # Install Tor RUN set -ex && \ apt-get update && \ - apt-get install -y git libevent-dev zlib1g-dev libssl-dev gcc make automake ca-certificates autoconf musl-dev coreutils wget && \ + apt-get install -y git libevent-dev zlib1g-dev libssl-dev gcc make automake ca-certificates autoconf musl-dev coreutils gpg wget && \ mkdir -p /usr/local/src/ && \ - git clone "$TOR_URL" /usr/local/src/tor && \ - cd /usr/local/src/tor && \ - git checkout "tor-$TOR_VERSION" && \ - ./autogen.sh && \ + cd /usr/local/src && \ + wget -qO "tor-$TOR_VERSION.tar.gz" "$TOR_URL/tor-$TOR_VERSION.tar.gz" && \ + wget -qO "tor-$TOR_VERSION.tar.gz.asc" "$TOR_URL/tor-$TOR_VERSION.tar.gz.asc" && \ + gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY1" && \ + gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY2" && \ + gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY3" && \ + gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY4" && \ + gpg --verify "tor-$TOR_VERSION.tar.gz.asc" && \ + tar -xzvf "tor-$TOR_VERSION.tar.gz" -C /usr/local/src && \ + cd "/usr/local/src/tor-$TOR_VERSION" && \ ./configure \ --disable-asciidoc \ --sysconfdir=/etc \ --disable-unittests && \ make && make install && \ cd .. && \ - rm -rf tor + rm -rf "tor-$TOR_VERSION" && \ + rm "tor-$TOR_VERSION.tar.gz" && \ + rm "tor-$TOR_VERSION.tar.gz.asc" # Install Golang & OBFS4 proxy RUN cd /usr/local/src && \