luckyimnotanigger/docker-tor-hidden-service
1
0
Fork 0
mirror of https://github.com/cmehay/docker-tor-hidden-service.git synced 2025-04-20 13:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Suppress error warnings to ensure builds succeed.

Browse source 
Fix `nprocs` should be `nproc`.
Update urls for the version scripts to point to the new gitlab instance of the torproject.
This commit is contained in:
raldone01 2025-01-08 22:49:02 +01:00
parent 547404ec3b
commit 396a23d275
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Dockerfile
View file

@ -7,7 +7,8 @@ ARG torsocks_version
ENV HOME /var/lib/tor ENV HOME /var/lib/tor
ENV POETRY_VIRTUALENVS_CREATE=false ENV POETRY_VIRTUALENVS_CREATE=false
RUN apk add --no-cache git bind-tools cargo libevent-dev openssl-dev gnupg gcc make automake ca-certificates autoconf musl-dev coreutils libffi-dev zlib-dev && \ RUN set -ex; \
apk add --no-cache git bind-tools cargo libevent-dev openssl-dev gnupg gcc make automake ca-certificates autoconf musl-dev coreutils libffi-dev zlib-dev && \
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 && \
@ -15,43 +16,50 @@ RUN apk add --no-cache git bind-tools cargo libevent-dev openssl-dev gnupg g
git checkout tor-$TOR_VERSION && \ git checkout tor-$TOR_VERSION && \
./autogen.sh && \ ./autogen.sh && \
./configure \ ./configure \
--enable-fatal-warnings=no \
--disable-asciidoc \ --disable-asciidoc \
--sysconfdir=/etc \ --sysconfdir=/etc \
--disable-unittests && \ --disable-unittests && \
make -j$(nprocs) && make install && \ make -j$(nproc) && make install && \
cd .. && \ cd .. && \
rm -rf tor && \ rm -rf tor && \
pip3 install --upgrade pip poetry && \ pip3 install --upgrade pip poetry && \
apk del git libevent-dev openssl-dev gnupg cargo make automake autoconf musl-dev coreutils libffi-dev && \ apk del git libevent-dev openssl-dev gnupg cargo make automake autoconf musl-dev coreutils libffi-dev && \
apk add --no-cache libevent openssl apk add --no-cache libevent openssl
RUN apk add --no-cache git gcc make automake autoconf musl-dev libtool && \ RUN set -ex; \
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 && \
TORSOCKS_VERSION=${torsocks_version=$(git tag | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)} && \ TORSOCKS_VERSION=${torsocks_version=$(git tag | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)} && \
git checkout $TORSOCKS_VERSION && \ git checkout $TORSOCKS_VERSION && \
./autogen.sh && \ ./autogen.sh && \
./configure && \ ./configure \
make -j$(nprocs) && make install && \ --enable-fatal-warnings=no && \
make -j$(nproc) && make install && \
cd .. && \ cd .. && \
rm -rf torsocks && \ rm -rf torsocks && \
apk del git gcc make automake autoconf musl-dev libtool apk del git gcc make automake autoconf musl-dev libtool
RUN mkdir -p /etc/tor/ RUN set -ex; \
mkdir -p /etc/tor/
COPY pyproject.toml /usr/local/src/onions/ COPY pyproject.toml /usr/local/src/onions/
RUN cd /usr/local/src/onions && apk add --no-cache openssl-dev libffi-dev gcc libc-dev && \ RUN set -ex; \
cd /usr/local/src/onions && apk add --no-cache openssl-dev libffi-dev gcc libc-dev && \
poetry install --only main --no-root && \ poetry install --only main --no-root && \
apk del libffi-dev gcc libc-dev openssl-dev apk del libffi-dev gcc libc-dev openssl-dev
COPY onions /usr/local/src/onions/onions COPY onions /usr/local/src/onions/onions
COPY poetry.lock /usr/local/src/onions/ COPY poetry.lock /usr/local/src/onions/
RUN cd /usr/local/src/onions && apk add --no-cache gcc libc-dev && \ RUN set -ex; \
cd /usr/local/src/onions && apk add --no-cache gcc libc-dev && \
poetry install --only main && \ poetry install --only main && \
apk del gcc libc-dev apk del gcc libc-dev
RUN mkdir -p ${HOME}/.tor && \ RUN set -ex; \
mkdir -p ${HOME}/.tor && \
addgroup -S -g 107 tor && \ addgroup -S -g 107 tor && \
adduser -S -G tor -u 104 -H -h ${HOME} tor adduser -S -G tor -u 104 -H -h ${HOME} tor

2
last_tor_version.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
git ls-remote --tags https://git.torproject.org/tor.git | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1 git ls-remote --tags https://gitlab.torproject.org/tpo/core/tor.git/ | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1

2
last_torsocks_version.sh
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
git ls-remote --tags https://git.torproject.org/torsocks.git | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1 git ls-remote --tags https://gitlab.torproject.org/tpo/core/torsocks.git/ | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1