Updated docker files

docker/dev/Dockerfile

@@ -1,11 +1,10 @@
-FROM ubuntu
+FROM ubuntu:14.04
 MAINTAINER Francesco Siddi <francesco@blender.org>
 
 RUN apt-get update && apt-get install -y \
 python \
 python-dev \
 python-pip \
-git \
 nano \
 zlib1g-dev \
 libjpeg-dev \
@@ -19,28 +18,24 @@ RUN add-apt-repository ppa:mc3man/trusty-media \
 && apt-get update && apt-get install -y \
 ffmpeg
 
-
-RUN mkdir /data \
-&& mkdir /data/www \
-&& mkdir /data/www/pillar \
-&& mkdir /data/dev \
-&& mkdir /data/dev/pillar \
-&& mkdir /storage \
-&& mkdir /storage/shared \
-&& mkdir /storage/pillar \
-&& mkdir /data/config \
-&& mkdir /storage/logs
-
-RUN git clone https://github.com/armadillica/pillar.git /data/www/pillar
+RUN mkdir -p /data/git/pillar \
+&& mkdir -p /data/storage/shared \
+&& mkdir -p /data/storage/pillar \
+&& mkdir -p /data/config \
+&& mkdir -p /data/storage/logs
 
 RUN pip install virtualenv \
 && virtualenv /data/venv
-RUN . /data/venv/bin/activate && pip install -r /data/www/pillar/requirements.txt
 
-VOLUME /data/dev/pillar
+ENV PIP_PACKAGES_VERSION = 1
+ADD requirements.txt /requirements.txt
+
+RUN . /data/venv/bin/activate && pip install -r /requirements.txt
+
+VOLUME /data/git/pillar
 VOLUME /data/config
-VOLUME /storage/shared
-VOLUME /storage/pillar
+VOLUME /data/storage/shared
+VOLUME /data/storage/pillar
 
 ENV MONGO_HOST mongo_pillar
 

docker/dev/runserver.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-. /data/venv/bin/activate && python /data/dev/pillar/pillar/manage.py runserver
+. /data/venv/bin/activate && python /data/git/pillar/pillar/manage.py runserver