From 980837c166c5da21b74789cd8c09932a3860f29b Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Tue, 1 Sep 2015 18:34:58 +0200
Subject: [PATCH] Tweaks to Dockerfile

---
 docker/Dockerfile   | 18 +++++++++++-------
 docker/runserver.sh |  3 +++
 2 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 docker/runserver.sh

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a6038034..c68218aa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,18 +10,22 @@ nano
 
 RUN mkdir /data
 RUN mkdir /data/www
-RUN mkdir /data/www/pillar_dev
+RUN mkdir /data/www/pillar
+RUN mkdir /data/dev
+RUN mkdir /data/dev/pillar
+
+RUN git clone https://github.com/armadillica/pillar.git /data/www/pillar
 
 RUN pip install virtualenv
 RUN virtualenv /data/venv
-#RUN . /data/venv/bin/activate
-#RUN pip install -r requirements.txt
+RUN . /data/venv/bin/activate && pip install -r /data/www/pillar/requirements.txt
 
-VOLUME /data/www/pillar_dev
+VOLUME /data/dev/pillar
 
-ENV MONGO_HOST='mongo_pillar'
+ENV MONGO_HOST mongo_pillar
 
 EXPOSE 5000
 
-#ENTRYPOINT . /data/venv/bin/activate; \
-#cd /data/www/pillar_dev; \
+ADD runserver.sh /runserver.sh
+
+ENTRYPOINT ["bash", "/runserver.sh"]
diff --git a/docker/runserver.sh b/docker/runserver.sh
new file mode 100644
index 00000000..ed75c1d6
--- /dev/null
+++ b/docker/runserver.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+. /data/venv/bin/activate && python /data/dev/pillar/pillar/manage.py runserver