From e7cac22a7aeafb6f136e03dc8317a5b672d06d75 Mon Sep 17 00:00:00 2001 From: Andrey Arapov Date: Sun, 4 Mar 2018 00:29:48 +0100 Subject: [PATCH] bump zeronet to v0.6.2 --- Dockerfile | 37 +++++++++++------------ Dockerfile.debian | 28 ------------------ README.md | 75 +++++++++-------------------------------------- launch | 2 +- 4 files changed, 32 insertions(+), 110 deletions(-) delete mode 100644 Dockerfile.debian diff --git a/Dockerfile b/Dockerfile index 381ea27..3187ff8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,37 +1,34 @@ # docker build -t my/zeronet . # docker run -d --name zeronet -v ~/.zeronetdata:/data -p 43110:43110 my/zeronet -FROM alpine:latest +FROM alpine:3.7 MAINTAINER Andrey Arapov -RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \ - && apk update \ - && apk add py-gevent@testing py-msgpack@testing wget ca-certificates python - -ENV USER zeronet -ENV UID 7000 -ENV HOME /home/$USER -# ENV PROJECT_VER v0.3.5 -# ENV PROJECT ZeroNet-0.3.5 -ENV PROJECT_VER master -ENV PROJECT ZeroNet-master -ENV DATA /data - -RUN adduser -D -u $UID -h $HOME -s /bin/true $USER +RUN apk update \ + && apk add py-gevent py-msgpack ca-certificates python # Optionally you may want to enable Tor in order to anonymize the traffic -RUN apk add tor@testing +RUN apk add tor RUN echo -e "ControlPort 9051\nSocksListenAddress 0.0.0.0" > /etc/tor/torrc # RUN echo -e "ControlPort 9051" > /etc/tor/torrc # RUN echo -e "ControlPort 9051\nCookieAuthentication 1" > /etc/tor/torrc # RUN adduser $USER tor +ENV USER=zeronet \ + UID=1000 \ + HOME=/home/zeronet \ + PROJECT_VER=v0.6.2 \ + PROJECT=ZeroNet-0.6.2 \ + DATA=/data + +RUN adduser -D -u $UID -h $HOME -s /bin/true $USER + USER $USER -VOLUME [ "$DATA" ] +VOLUME ["$DATA"] WORKDIR $HOME -RUN wget -q https://github.com/HelloZeroNet/ZeroNet/archive/${PROJECT_VER}.tar.gz \ - && tar xpzf ${PROJECT_VER}.tar.gz \ - && rm -f ${PROJECT_VER}.tar.gz \ +RUN wget -O data.tar.gz -q https://github.com/HelloZeroNet/ZeroNet/archive/${PROJECT_VER}.tar.gz \ + && tar xpzf data.tar.gz \ + && rm -f data.tar.gz \ && cd $PROJECT \ && mkdir log \ && touch log/error.log \ diff --git a/Dockerfile.debian b/Dockerfile.debian deleted file mode 100644 index 11bbde5..0000000 --- a/Dockerfile.debian +++ /dev/null @@ -1,28 +0,0 @@ -FROM debian:jessie -MAINTAINER Andrey Arapov - -# To avoid problems with Dialog and curses wizards -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update \ - && apt-get -qy install python python-gevent python-msgpack wget - -ENV USER zeronet -ENV UID 7000 -ENV HOME /home/$USER -RUN useradd -u $UID -m -d $HOME -s /usr/sbin/nologin $USER - -RUN echo "UTC" > /etc/timezone \ - && dpkg-reconfigure tzdata - -USER $USER -WORKDIR $HOME -RUN wget -q https://github.com/HelloZeroNet/ZeroNet/archive/master.tar.gz \ - && tar xpzf master.tar.gz \ - && rm -f master.tar.gz \ - && cd ZeroNet-master \ - && mkdir log \ - && touch log/error.log - -WORKDIR $HOME/ZeroNet-master -CMD python zeronet.py --ui_ip 0.0.0.0 diff --git a/README.md b/README.md index 8f3687f..ddfb09c 100644 --- a/README.md +++ b/README.md @@ -1,72 +1,25 @@ -Intro -===== +Zeronet in Docker container. -Running Zeronet in Docker container +# Build & Run - -Run -=== -``` -docker run -d \ - --name zeronet - -v zeronet_data:/data - -p 127.0.0.1:43110:43110 - -p 15441:15441 - my/zeronet -``` - -Access -====== ``` -http://127.0.0.1:43110 +docker build -t andrey01/zeronet . +docker-compose run --rm --service-ports zeronet ``` -Additional notes -================ - -If you are running your Web browser in the container, then you need to make -sure both containers are on the same network in order to access the ZeroNet WebUI. - -``` -docker network connect glue -docker network connect glue chrome -docker network connect glue zeronet -``` - -Running zeronet with docker-compose: -``` -docker-compose up -d -``` +# Access -And access it via `http://zeronet:43110` - - -If you wish to build the image -``` -docker build -t my/zeronet . -``` - - -Tor proxy ---------- - -Additionally you can use this zeronet container as Tor proxy. - -Firefox configuration -``` -Manual proxy configuration -SOCKS Host: zeronet -SOCKS Port: 9050 -SOCKS version: v5 -[x] Remote DNS -No Proxy for: localhost, 127.0.0.1, zeronet -``` +- http://127.0.0.1:43110 -Backing up the data -------------------- +# Backing up the data -The following command will create a backup of your zeronet_data volume in your $HOME/zeronet_data.tar +The following command will create a backup of your ``zeronet_data`` volume in your current directory as ``zeronet_data.tar`` file: ``` -docker run --rm -v zeronet_data:/data:ro -v $(pwd):/backup alpine:3.3 tar cvf /backup/zeronet_data.tar /data +docker run \ + --rm \ + -v zeronet_data:/data:ro \ + -v $(pwd):/export \ + alpine:3.7 \ + tar cvf /export/zeronet_data.tar /data ``` diff --git a/launch b/launch index 05f9e2d..9e1576c 100755 --- a/launch +++ b/launch @@ -8,4 +8,4 @@ cd "$(dirname "$(realpath "$0")")" /usr/bin/tor & chown -Rh $USER:$USER $DATA -su -s /bin/sh $USER -c "python zeronet.py --ui_ip 0.0.0.0" +su -s /bin/sh $USER -c "python zeronet.py --ui_ip 0.0.0.0 --ui_port 43110"