Don't build tests and reset confdir to /etc

This commit is contained in:
Christophe Mehay 2016-09-27 18:54:59 +02:00
parent 38ba81f386
commit 2e0f4dab4a
2 changed files with 7 additions and 3 deletions

View file

@ -8,7 +8,12 @@ RUN apk add --no-cache git libevent-dev openssl-dev gcc make automake ca-cer
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} && \ git checkout tor-${TOR_VERSION} && \
./autogen.sh && ./configure --disable-asciidoc && make && make install && \ ./autogen.sh && \
./configure \
--disable-asciidoc \
--sysconfdir=/etc \
--disable-unittests && \
make && make install && \
cd .. && \ cd .. && \
rm -rf tor && \ rm -rf tor && \
apk add --no-cache python3 python3-dev && \ apk add --no-cache python3 python3-dev && \

View file

@ -22,7 +22,7 @@ from base64 import b32encode
class Setup(object): class Setup(object):
hidden_service_dir = "/var/lib/tor/hidden_service/" hidden_service_dir = "/var/lib/tor/hidden_service/"
torrc = '/usr/local/etc/tor/torrc' torrc = '/etc/tor/torrc'
torrc_template = '/var/local/tor/torrc.tpl' torrc_template = '/var/local/tor/torrc.tpl'
def onion_url_gen(self, key): def onion_url_gen(self, key):
@ -37,7 +37,6 @@ class Setup(object):
return '{onion}.onion'.format(onion=onion.decode().lower()) return '{onion}.onion'.format(onion=onion.decode().lower())
def _add_host(self, host): def _add_host(self, host):
if host not in self.setup: if host not in self.setup:
self.setup[host] = {} self.setup[host] = {}