equal
deleted
inserted
replaced
4 python python-pip \ |
4 python python-pip \ |
5 uwsgi uwsgi-plugin-python |
5 uwsgi uwsgi-plugin-python |
6 |
6 |
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 RUN install -d /srv/qmsk-www |
9 WORKDIR /srv/qmsk-www |
|
10 |
10 ADD requirements.txt /srv/qmsk-www |
11 ADD requirements.txt /srv/qmsk-www |
11 RUN pip install -r /srv/qmsk-www/requirements.txt |
12 RUN pip install -r requirements.txt |
12 |
13 |
13 RUN install -d /srv/qmsk-www/etc /srv/qmsk-www/var |
14 RUN install -d /srv/qmsk-www/etc /srv/qmsk-www/var |
14 ADD . /srv/qmsk-www |
15 ADD . /srv/qmsk-www |
15 |
|
16 WORKDIR /srv/qmsk-www |
|
17 |
16 |
18 RUN python ./manage.py collectstatic --noinput |
17 RUN python ./manage.py collectstatic --noinput |
19 |
18 |
20 RUN ln -s /srv/qmsk-www/docker/production.py /srv/qmsk-www/qmsk_www/settings/production.py |
19 RUN ln -s /srv/qmsk-www/docker/production.py /srv/qmsk-www/qmsk_www/settings/production.py |
21 |
20 |
22 USER qmsk-www |
21 USER qmsk-www |
23 CMD uwsgi --ini /srv/qmsk-www/docker/uwsgi.ini --http-socket :9090 |
22 CMD uwsgi --ini /srv/qmsk-www/docker/uwsgi.ini --http-socket :9090 |
24 EXPOSE 9090/tcp |
23 EXPOSE 9090/tcp |
25 |
24 |
26 VOLUME /srv/qmsk-www-pages |
25 VOLUME /srv/qmsk-www/pages |
27 |
26 |
28 ENV \ |
27 ENV \ |
29 DJANGO_SERVER_NAME= \ |
28 DJANGO_SERVER_NAME= \ |
30 DJANGO_SERVER_ALIAS= \ |
29 DJANGO_SERVER_ALIAS= \ |
31 DJANGO_SECRET= \ |
30 DJANGO_SECRET= \ |
32 QMSK_WWW_PAGES_PATH=/srv/qmsk-www-pages |
31 QMSK_WWW_PAGES_PATH=/srv/qmsk-www/pages |