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

Bump to tor 0.4.4.7

Browse source 
Add rust in the tor build stage
also ignore GPG_KEY to avoid waring at startup
This commit is contained in:
Chirstophe Mehay 2021-02-13 00:07:48 +01:00 • committed by Christophe Mehay
parent 5d4e7a6c9c
commit 3a65c8dc48
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -7,7 +7,7 @@ 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 libevent-dev openssl-dev gnupg gcc make automake ca-certificates autoconf musl-dev coreutils libffi-dev zlib-dev && \ 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 && \
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 && \
@ -22,7 +22,7 @@ RUN apk add --no-cache git bind-tools libevent-dev openssl-dev gnupg gcc mak
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 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 apk add --no-cache git gcc make automake autoconf musl-dev libtool && \

3
onions/Onions.py
View file

@ -198,7 +198,8 @@ class Setup(object):
for reg, call in match_map: for reg, call in match_map:
for key, val in os.environ.items(): for key, val in os.environ.items():
m = match(reg, key) m = match(reg, key)
if m: # Ignore GPG_KEY env variable to avoid warning (this is a deprecated setup)
if m and key != 'GPG_KEY':
try: try:
call(m.groups()[0].lower(), val) call(m.groups()[0].lower(), val)
except BaseException as e: except BaseException as e: