# HG changeset patch
# User Tero Marttila <terom@qmsk.net>
# Date 1500108955 -10800
# Node ID 64fabfe65a5b7a847f1ad74212ac0074ee098188
# Parent  86d6c462a3bc128947a93caaa8782acc720a9569
docker: tweak workdir, rename volume to /srv/qmsk-www/pages

diff -r 86d6c462a3bc -r 64fabfe65a5b Dockerfile
--- a/Dockerfile	Tue Jul 04 00:00:26 2017 +0300
+++ b/Dockerfile	Sat Jul 15 11:55:55 2017 +0300
@@ -6,15 +6,14 @@
 
 RUN adduser --system --uid 1000 --home /srv/qmsk-www --group qmsk-www
 
-RUN install -d /srv/qmsk-www
+WORKDIR /srv/qmsk-www
+
 ADD requirements.txt /srv/qmsk-www
-RUN pip install -r /srv/qmsk-www/requirements.txt
+RUN pip install -r requirements.txt
 
 RUN install -d /srv/qmsk-www/etc /srv/qmsk-www/var
 ADD . /srv/qmsk-www
 
-WORKDIR /srv/qmsk-www
-
 RUN python ./manage.py collectstatic --noinput
 
 RUN ln -s /srv/qmsk-www/docker/production.py /srv/qmsk-www/qmsk_www/settings/production.py
@@ -23,10 +22,10 @@
 CMD uwsgi --ini /srv/qmsk-www/docker/uwsgi.ini --http-socket :9090
 EXPOSE 9090/tcp
 
-VOLUME /srv/qmsk-www-pages
+VOLUME /srv/qmsk-www/pages
 
 ENV \
   DJANGO_SERVER_NAME= \
   DJANGO_SERVER_ALIAS= \
   DJANGO_SECRET= \
-  QMSK_WWW_PAGES_PATH=/srv/qmsk-www-pages
+  QMSK_WWW_PAGES_PATH=/srv/qmsk-www/pages