From 3d2bac4b4aa6a9f113a32d7adcb01fcf0d1da21f Mon Sep 17 00:00:00 2001
From: caskd <caskd@420blaze.it>
Date: Fri, 10 Jan 2020 16:37:21 +0100
Subject: [PATCH] Change hostnames, temporary image usage with Tor, git builds

---
 build/Dockerfile | 8 +++++---
 zeronet.yml      | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 1380297..a1848fc 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,14 +1,16 @@
 FROM alpine:latest as fetcher
 
 WORKDIR /tmp
-RUN apk add --no-cache --update curl tar ca-certificates
-RUN curl -L https://github.com/HelloZeroNet/ZeroNet/archive/py3/ZeroNet-py3.tar.gz | tar xvpz
+RUN apk add --no-cache --update git curl ca-certificates
+RUN curl -OL https://raw.githubusercontent.com/SuperSandro2000/docker-images/master/zeronet/files/pip.conf
+RUN git clone https://github.com/HelloZeroNet/ZeroNet.git ZeroNet
 
 # Switch to pypy after https://bitbucket.org/pypy/pypy/commits/e7f5d75f3f87 fix works in upstream
 FROM python:latest
 WORKDIR /app
 RUN useradd -lM zeronet
-COPY --from=fetcher /tmp/ZeroNet-py3/* ./
+COPY --from=fetcher /tmp/ZeroNet/* ./
+COPY --from=fetcher /tmp/pip.conf /etc/pip.conf
 RUN pip install -r requirements.txt
 
 EXPOSE 43110
diff --git a/zeronet.yml b/zeronet.yml
index dc2491f..d94ddf3 100644
--- a/zeronet.yml
+++ b/zeronet.yml
@@ -12,8 +12,8 @@ networks:
 
 services:
   server:
-    image: localhost:5000/zeronet
-    command: ["zeronet.py", "--tor", "always", "--tor-proxy", "tor_server:9050", "--ui-ip", "*"]
+    image: nofish/zeronet #localhost:5000/zeronet Import problems?
+    command: "ash -c '( tor& ) && python3 zeronet.py --ui_ip 0.0.0.0 --tor enable'"
     deploy:
       replicas: 1
       resources:
@@ -27,7 +27,7 @@ services:
         order: start-first
         failure_action: rollback
       placement:
-        constraints: [node.hostname == fra-n4]
+        constraints: [node.hostname == nbg-4]
     logging: *json-log
     networks:
       - tor_backend