oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #587 from aitorpazos/master

Browse source 
Update Dockerfile base image to ubuntu 16.04 LTS and add Tor support to it (disabled by default).
This commit is contained in:
ZeroNet 2016-10-07 16:27:22 +02:00 committed by GitHub
commit ae2e15a6fa
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:14.04 FROM ubuntu:16.04
MAINTAINER Felix Imobersteg <felix@whatwedo.ch> MAINTAINER Felix Imobersteg <felix@whatwedo.ch>
@ -9,17 +9,23 @@ ENV HOME /root
#Install ZeroNet #Install ZeroNet
RUN \ RUN \
apt-get update -y; \ 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; \ pip install msgpack-python --upgrade; \
apt-get clean -y; \ 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 Zeronet source
ADD . /root ADD . /root
VOLUME /root/data VOLUME /root/data
#Control if Tor proxy is started
ENV ENABLE_TOR false
#Set upstart command #Set upstart command
CMD cd /root && python zeronet.py --ui_ip 0.0.0.0 CMD cd /root && (! ${ENABLE_TOR} || /etc/init.d/tor start) && python zeronet.py --ui_ip 0.0.0.0
#Expose ports #Expose ports
EXPOSE 43110 EXPOSE 43110

5
README.md
View file

@ -103,6 +103,11 @@ It downloads the latest version of ZeroNet then starts it automatically.
### [Docker](https://www.docker.com/) ### [Docker](https://www.docker.com/)
* `docker run -d -v <local_data_folder>:/root/data -p 15441:15441 -p 43110:43110 nofish/zeronet` * `docker run -d -v <local_data_folder>:/root/data -p 15441:15441 -p 43110:43110 nofish/zeronet`
* This Docker image includes the Tor proxy, which is disabled by default. Beware that some
hosting providers may not allow you running Tor in their servers. If you want to enable it,
set `ENABLE_TOR` environment variable to `true` (Default: `false`). E.g.:
`docker run -d -e "ENABLE_TOR=true" -v <local_data_folder>:/root/data -p 15441:15441 -p 43110:43110 nofish/zeronet`
* Open http://127.0.0.1:43110/ in your browser * Open http://127.0.0.1:43110/ in your browser
### [Virtualenv](https://virtualenv.readthedocs.org/en/latest/) ### [Virtualenv](https://virtualenv.readthedocs.org/en/latest/)