From 1dcec5c58008f73f869a5b97524ff4d7c7491e62 Mon Sep 17 00:00:00 2001 From: Chirstophe Mehay Date: Sat, 13 Feb 2021 00:07:48 +0100 Subject: [PATCH] Bump to tor 0.4.4.7 Add rust in the tor build stage also ignore GPG_KEY to avoid waring at startup --- Dockerfile | 4 ++-- onions/Onions.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b468241..74ec698 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG torsocks_version ENV HOME /var/lib/tor 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/ && \ git clone https://git.torproject.org/tor.git /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 .. && \ rm -rf tor && \ 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 RUN apk add --no-cache git gcc make automake autoconf musl-dev libtool && \ diff --git a/onions/Onions.py b/onions/Onions.py index 32cb8a0..a7bcc9b 100644 --- a/onions/Onions.py +++ b/onions/Onions.py @@ -198,7 +198,8 @@ class Setup(object): for reg, call in match_map: for key, val in os.environ.items(): 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: call(m.groups()[0].lower(), val) except BaseException as e: