fix pngtile virtualenv
authorTero Marttila <terom@qmsk.net>
Sat, 15 Jul 2017 12:15:00 +0300
changeset 259 da2d2f5d9d98
parent 258 d2ff2d061b76
child 260 1d7d2fbfc855
fix pngtile virtualenv
Dockerfile.pngtile
docker/uwsgi-pngtile.ini
--- a/Dockerfile.pngtile	Sat Jul 15 12:06:24 2017 +0300
+++ b/Dockerfile.pngtile	Sat Jul 15 12:15:00 2017 +0300
@@ -9,13 +9,13 @@
 WORKDIR /srv/qmsk-www
 
 ADD requirements.txt /srv/qmsk-www
-RUN pip install -r requirements.txt
+RUN /opt/pngtile/bin/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 /opt/pngtile/bin/python ./manage.py collectstatic --noinput
 
 RUN ln -s /srv/qmsk-www/docker/production-pngtile.py /srv/qmsk-www/qmsk_pngtile/settings/production.py
 
--- a/docker/uwsgi-pngtile.ini	Sat Jul 15 12:06:24 2017 +0300
+++ b/docker/uwsgi-pngtile.ini	Sat Jul 15 12:15:00 2017 +0300
@@ -1,4 +1,5 @@
 [uwsgi]
 plugin = python
+virtualenv = /opt/pngtile
 wsgi-file = /srv/qmsk-www/qmsk_pngtile/wsgi.py
 static-map = /static=/srv/qmsk-www/var/static