--- a/Dockerfile.pngtile	Sat Jul 15 11:55:55 2017 +0300
+++ b/Dockerfile.pngtile	Sat Jul 15 11:56:04 2017 +0300
@@ -1,31 +1,32 @@
-FROM qmsk/pngtile
+FROM qmsk/pngtile.common
 
 RUN apt-get update && apt-get install -y \
+  python python-pip \
   uwsgi uwsgi-plugin-python
 
-RUN adduser --system --uid 1000 --home /srv/www-pngtile --group pngtile
-
-WORKDIR /srv/www-pngtile
+RUN adduser --system --uid 1000 --home /srv/qmsk-www --group qmsk-www
 
-ADD requirements.txt /srv/www-pngtile
-RUN pip install -r /srv/www-pngtile/requirements.txt
+WORKDIR /srv/qmsk-www
 
-RUN install -d /srv/www-pngtile/etc /srv/www-pngtile/www
-ADD . /srv/www-pngtile
+ADD requirements.txt /srv/qmsk-www
+RUN pip install -r requirements.txt
 
+RUN install -d /srv/qmsk-www/etc /srv/qmsk-www/var
+ADD . /srv/qmsk-www
+
+ENV DJANGO_SETTINGS_MODULE=qmsk_pngtile.settings
 RUN python ./manage.py collectstatic --noinput
 
-RUN ln -s /srv/www-pngtile/docker/production-pngtile.py /srv/www-pngtile/qmsk_pngtile/settings/production.py
+RUN ln -s /srv/qmsk-www/docker/production-pngtile.py /srv/qmsk-www/qmsk_pngtile/settings/production.py
 
-USER pngtile
-CMD uwsgi --ini /srv/www-pngtile/docker/uwsgi-pngtile.ini --http-socket :9090
+USER qmsk-www
+CMD uwsgi --ini /srv/qmsk-www/docker/uwsgi-pngtile.ini --http-socket :9090
 EXPOSE 9090/tcp
 
-VOLUME /srv/pngtile/var
+VOLUME /srv/pngtile/images
 
 ENV \
   DJANGO_SERVER_NAME= \
   DJANGO_SERVER_ALIAS= \
   DJANGO_SECRET= \
-  QMSK_PNGTILE_PATH=/srv/pngtile/var
-
+  QMSK_PNGTILE_PATH=/srv/pngtile/images