From ee5b8df729d15eddd3bbd75ff3faf2a07a4ada33 Mon Sep 17 00:00:00 2001
From: Andrey Arapov <andrey.arapov@nixaid.com>
Date: Wed, 23 Mar 2016 10:59:16 +0100
Subject: [PATCH] add docker-compose file and updated README

---
 Dockerfile         | 10 +++++++---
 README.md          |  9 +++++++--
 docker-compose.yml | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index 11d29b4..60f0542 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,16 +11,20 @@ RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/ap
 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
 
 USER $USER
 VOLUME [ "$DATA" ]
 WORKDIR $HOME
-RUN wget -q https://github.com/HelloZeroNet/ZeroNet/archive/master.tar.gz \
-    && tar xpzf master.tar.gz \
-    && rm -f master.tar.gz \
+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 \
     && cd $PROJECT \
     && mkdir log \
     && touch log/error.log \
diff --git a/README.md b/README.md
index 5e794f4..cc6b2cf 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ docker build -t my/zeronet .
 Run
 ===
 ```
-docker run -d --name zeronet -v ~/.zeronetdata:/data -p 43110:43110 my/zeronet
+docker run -d --name zeronet -v zeronetdata:/data -p 43110:43110 my/zeronet
 ```
 
 Access
@@ -28,7 +28,12 @@ If you already have your Web browser running in a container (e.g. Firefox in
 the `firefox_net` network), then you can run Zeronet container in the
 following way
 ```
-docker run -d --name zeronet -v ~/.zeronetdata:/data --net firefox_net my/zeronet
+docker run -d --name zeronet -v zeronetdata:/data --net firefox_net my/zeronet
+```
+
+With docker-compose it is even simpler
+```
+docker-compose up -d
 ```
 
 And access it via `http://zeronet:43110`
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..173565c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '2'
+
+services:
+  zeronet:
+    build: ./
+    read_only: false
+    networks:
+      net:
+    volumes:
+      - data:/data
+
+volumes:
+  data: {}
+
+networks:
+  net:
+    external:
+      name: firefox_net