From 7078badefabbd06b8679b1e5cd93c2c799306afc Mon Sep 17 00:00:00 2001 From: canewsin Date: Fri, 3 Dec 2021 00:48:16 +0530 Subject: [PATCH] Update Docker Image --- Dockerfile | 12 ++++++------ README.md | 17 +++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7839cfa0..3f1d3c18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.15 #Base settings ENV HOME /root @@ -6,9 +6,9 @@ ENV HOME /root COPY requirements.txt /root/requirements.txt #Install ZeroNet -RUN apk --update --no-cache --no-progress add python3 python3-dev gcc libffi-dev musl-dev make tor openssl \ +RUN apk --update --no-cache --no-progress add python3 python3-dev py3-pip gcc g++ autoconf automake libtool libffi-dev musl-dev make tor openssl \ && pip3 install -r /root/requirements.txt \ - && apk del python3-dev gcc libffi-dev musl-dev make \ + && apk del python3-dev gcc g++ autoconf automake libtool libffi-dev musl-dev make \ && echo "ControlPort 9051" >> /etc/tor/torrc \ && echo "CookieAuthentication 1" >> /etc/tor/torrc @@ -22,12 +22,12 @@ COPY . /root VOLUME /root/data #Control if Tor proxy is started -ENV ENABLE_TOR false +ENV ENABLE_TOR true WORKDIR /root #Set upstart command -CMD (! ${ENABLE_TOR} || tor&) && python3 zeronet.py --ui_ip 0.0.0.0 --fileserver_port 26552 +CMD (! ${ENABLE_TOR} || tor&) && python3 zeronet.py --ui_ip 0.0.0.0 --fileserver_port 26117 #Expose ports -EXPOSE 43110 26552 +EXPOSE 43110 26117 diff --git a/README.md b/README.md index d8e36a71..3ec13c21 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -# ZeroNet [![Build Status](https://travis-ci.org/HelloZeroNet/ZeroNet.svg?branch=py3)](https://travis-ci.org/HelloZeroNet/ZeroNet) [![Documentation](https://img.shields.io/badge/docs-faq-brightgreen.svg)](https://zeronet.io/docs/faq/) [![Help](https://img.shields.io/badge/keep_this_project_alive-donate-yellow.svg)](https://zeronet.io/docs/help_zeronet/donate/) ![tests](https://github.com/HelloZeroNet/ZeroNet/workflows/tests/badge.svg) [![Docker Pulls](https://img.shields.io/docker/pulls/nofish/zeronet)](https://hub.docker.com/r/nofish/zeronet) +# ZeroNet [![tests](https://github.com/canewsin/ZeroNet/actions/workflows/tests.yml/badge.svg)](https://github.com/canewsin/ZeroNet/actions/workflows/tests.yml) [![Documentation](https://img.shields.io/badge/docs-faq-brightgreen.svg)](https://zeronet.io/docs/faq/) [![Help](https://img.shields.io/badge/keep_this_project_alive-donate-yellow.svg)](https://zeronet.io/docs/help_zeronet/donate/) [![Docker Pulls](https://img.shields.io/docker/pulls/canewsin/zeronet)](https://hub.docker.com/r/canewsin/zeronet) -Decentralized websites using Bitcoin crypto and the BitTorrent network - https://zeronet.io / [onion](http://zeronet34m3r5ngdu54uj57dcafpgdjhxsgq5kla5con4qvcmfzpvhad.onion) + +Decentralized websites using Bitcoin crypto and the BitTorrent network - https://zeronet.dev / [onion](http://zeronet34m3r5ngdu54uj57dcafpgdjhxsgq5kla5con4qvcmfzpvhad.onion) ## Why? @@ -33,7 +34,7 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network - https:/ * After starting `zeronet.py` you will be able to visit zeronet sites using `http://127.0.0.1:43110/{zeronet_address}` (eg. - `http://127.0.0.1:43110/1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D`). + `http://127.0.0.1:43110/1HELLoE3sFD9569CLCbHEAVqvqV7U2Ri9d`). * When you visit a new zeronet site, it tries to find peers using the BitTorrent network so it can download the site files (html, css, js...) from them. * Each visited site is also served by you. @@ -91,7 +92,7 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network - https:/ - XDA Labs: https://labs.xda-developers.com/store/app/in.canews.zeronet #### Docker -There is an official image, built from source at: https://hub.docker.com/r/nofish/zeronet/ +There is an official image, built from source at: https://hub.docker.com/r/canewsin/zeronet/ ### Install from source @@ -114,7 +115,7 @@ There is an official image, built from source at: https://hub.docker.com/r/nofis ## How can I create a ZeroNet site? - * Click on **⋮** > **"Create new, empty site"** menu item on the site [ZeroHello](http://127.0.0.1:43110/1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D). + * Click on **⋮** > **"Create new, empty site"** menu item on the site [ZeroHello](http://127.0.0.1:43110/1HELLoE3sFD9569CLCbHEAVqvqV7U2Ri9d). * You will be **redirected** to a completely new site that is only modifiable by you! * You can find and modify your site's content in **data/[yoursiteaddress]** directory * After the modifications open your site, drag the topright "0" button to left, then press **sign** and **publish** buttons on the bottom @@ -123,7 +124,7 @@ Next steps: [ZeroNet Developer Documentation](https://zeronet.io/docs/site_devel ## Help keep this project alive -- Bitcoin: 1QDhxQ6PraUZa21ET5fYUCPgdrwBomnFgX +- Bitcoin: 1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX - Paypal: https://zeronet.io/docs/help_zeronet/donate/ ### Sponsors @@ -133,5 +134,5 @@ Next steps: [ZeroNet Developer Documentation](https://zeronet.io/docs/site_devel #### Thank you! * More info, help, changelog, zeronet sites: https://www.reddit.com/r/zeronet/ -* Come, chat with us: [#zeronet @ FreeNode](https://kiwiirc.com/client/irc.freenode.net/zeronet) or on [gitter](https://gitter.im/HelloZeroNet/ZeroNet) -* Email: hello@zeronet.io (PGP: [960F FF2D 6C14 5AA6 13E8 491B 5B63 BAE6 CB96 13AE](https://zeronet.io/files/tamas@zeronet.io_pub.asc)) +* Come, chat with us: [#zeronet @ FreeNode](https://kiwiirc.com/client/irc.freenode.net/zeronet) or on [gitter](https://gitter.im/canewsin/ZeroNet) +* Email: canews.in@gmail.com