equal
deleted
inserted
replaced
7 RUN adduser --system --uid 1000 --home /srv/qmsk-www --group qmsk-www |
7 RUN adduser --system --uid 1000 --home /srv/qmsk-www --group qmsk-www |
8 |
8 |
9 WORKDIR /srv/qmsk-www |
9 WORKDIR /srv/qmsk-www |
10 |
10 |
11 ADD requirements.txt /srv/qmsk-www |
11 ADD requirements.txt /srv/qmsk-www |
12 RUN pip install -r requirements.txt |
12 RUN /opt/pngtile/bin/pip install -r requirements.txt |
13 |
13 |
14 RUN install -d /srv/qmsk-www/etc /srv/qmsk-www/var |
14 RUN install -d /srv/qmsk-www/etc /srv/qmsk-www/var |
15 ADD . /srv/qmsk-www |
15 ADD . /srv/qmsk-www |
16 |
16 |
17 ENV DJANGO_SETTINGS_MODULE=qmsk_pngtile.settings |
17 ENV DJANGO_SETTINGS_MODULE=qmsk_pngtile.settings |
18 RUN python ./manage.py collectstatic --noinput |
18 RUN /opt/pngtile/bin/python ./manage.py collectstatic --noinput |
19 |
19 |
20 RUN ln -s /srv/qmsk-www/docker/production-pngtile.py /srv/qmsk-www/qmsk_pngtile/settings/production.py |
20 RUN ln -s /srv/qmsk-www/docker/production-pngtile.py /srv/qmsk-www/qmsk_pngtile/settings/production.py |
21 |
21 |
22 USER qmsk-www |
22 USER qmsk-www |
23 CMD uwsgi --ini /srv/qmsk-www/docker/uwsgi-pngtile.ini --http-socket :9090 |
23 CMD uwsgi --ini /srv/qmsk-www/docker/uwsgi-pngtile.ini --http-socket :9090 |