Change hostnames, temporary image usage with Tor, git builds

This commit is contained in:
caskd 2020-01-10 16:37:21 +01:00
parent 5fe21744e9
commit 3d2bac4b4a
No known key found for this signature in database
GPG Key ID: 79DB21404E300A27
2 changed files with 8 additions and 6 deletions

View File

@ -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

View File

@ -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