mirror of
https://github.com/cmehay/docker-tor-hidden-service.git
synced 2025-04-19 21:39:13 +00:00
Make docker determine the 'last tor version' and 'last torsocks version'
This copies the logic from last_tor_version.sh and last_torsocks_version.sh into the Dockerfile itself. The Tor version can still be specified with the `tor_version` and `torsocks_version` arguments, as before. If these arguments are missing, the last versions are determined by the regular expression. This has a couple of advantages: 1) Users need not have git, make or docker-compose installed to build the image. 2) Users can build the image entirely inside a container which reduces the trust needed in the safety of the build instructions. 3) `git tag` is much quicker than `git ls-remote` since it operates on local data.
This commit is contained in:
parent
83d59f7ff0
commit
25f83d89a5
1 changed files with 6 additions and 2 deletions
|
@ -1,4 +1,6 @@
|
||||||
FROM python:3.8-alpine
|
FROM python:3.8-alpine
|
||||||
|
|
||||||
|
# if omitted, the versions are determined from the git tags
|
||||||
ARG tor_version
|
ARG tor_version
|
||||||
ARG torsocks_version
|
ARG torsocks_version
|
||||||
|
|
||||||
|
@ -9,7 +11,8 @@ RUN apk add --no-cache git bind-tools libevent-dev openssl-dev gnupg gcc mak
|
||||||
mkdir -p /usr/local/src/ /var/lib/tor/ && \
|
mkdir -p /usr/local/src/ /var/lib/tor/ && \
|
||||||
git clone https://git.torproject.org/tor.git /usr/local/src/tor && \
|
git clone https://git.torproject.org/tor.git /usr/local/src/tor && \
|
||||||
cd /usr/local/src/tor && \
|
cd /usr/local/src/tor && \
|
||||||
git checkout tor-$tor_version && \
|
TOR_VERSION=${tor_version=$(git tag | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)} && \
|
||||||
|
git checkout tor-$TOR_VERSION && \
|
||||||
./autogen.sh && \
|
./autogen.sh && \
|
||||||
./configure \
|
./configure \
|
||||||
--disable-asciidoc \
|
--disable-asciidoc \
|
||||||
|
@ -25,7 +28,8 @@ RUN apk add --no-cache git bind-tools libevent-dev openssl-dev gnupg gcc mak
|
||||||
RUN apk add --no-cache git gcc make automake autoconf musl-dev libtool && \
|
RUN apk add --no-cache git gcc make automake autoconf musl-dev libtool && \
|
||||||
git clone https://git.torproject.org/torsocks.git /usr/local/src/torsocks && \
|
git clone https://git.torproject.org/torsocks.git /usr/local/src/torsocks && \
|
||||||
cd /usr/local/src/torsocks && \
|
cd /usr/local/src/torsocks && \
|
||||||
git checkout $torsocks_version && \
|
TORSOCKS_VERSION=${torsocks_version=$(git tag | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)} && \
|
||||||
|
git checkout $TORSOCKS_VERSION && \
|
||||||
./autogen.sh && \
|
./autogen.sh && \
|
||||||
./configure && \
|
./configure && \
|
||||||
make && make install && \
|
make && make install && \
|
||||||
|
|
Loading…
Add table
Reference in a new issue