From 9e68a6f7e7bbfdf768cd7bc60b42af10b7979465 Mon Sep 17 00:00:00 2001 From: Aitor Pazos Date: Sun, 18 Sep 2016 19:06:51 +0100 Subject: [PATCH] Update base image to ubuntu 16.04 LTS and add tor support to it. In order to keep the Dockerfile simple, needed opotions have been appended to package provided torrc file and the /etc/init.d/tor script is used to start tor. If further customisation is desired, a wrapper script should be created to have further control on the startup. This would allow things like specifying external (tor) proxies and disable tor startup in those situations. --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d521d18c..0ad99f29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 MAINTAINER Felix Imobersteg @@ -9,17 +9,20 @@ ENV HOME /root #Install ZeroNet RUN \ apt-get update -y; \ - apt-get -y install msgpack-python python-gevent python-pip python-dev; \ + apt-get -y install msgpack-python python-gevent python-pip python-dev tor; \ pip install msgpack-python --upgrade; \ apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \ + echo "ControlPort 9051" >> /etc/tor/torrc; \ + echo "CookieAuthentication 1" >> /etc/tor/torrc + #Add Zeronet source ADD . /root VOLUME /root/data #Set upstart command -CMD cd /root && python zeronet.py --ui_ip 0.0.0.0 +CMD cd /root && /etc/init.d/tor start && python zeronet.py --ui_ip 0.0.0.0 #Expose ports EXPOSE 43110