Skip to content

Commit

Permalink
поправки по сборке докера
Browse files Browse the repository at this point in the history
  • Loading branch information
telminov committed May 31, 2017
1 parent 0c21735 commit 835f25b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# docker build telminov/personnel-testing .
FROM telminov/ubuntu-14.04-python-3.5

RUN apt-get update && \
Expand All @@ -6,14 +7,14 @@ RUN apt-get update && \
git \
supervisor

RUN /var/log/personnel_testing/
RUN mkdir /var/log/personnel_testing/

RUN mkdir /opt/personnel-testing
COPY . /opt/personnel-testing/
WORKDIR /opt/personnel-testing/

RUN pip3 install -r requirements.txt
RUN cp project/settings.sample.py project/settings.py
RUN cp project/local_settings.sample.py project/local_settings.py

COPY supervisor/supervisord.conf /etc/supervisor/supervisord.conf
COPY supervisor/prod.conf /etc/supervisor/conf.d/personnel-testing.conf
Expand All @@ -29,6 +30,6 @@ CMD test "$(ls /conf/settings.py)" || cp project/settings.py /conf/settings.py;
rm -rf static; ln -s /static static; \
python3 ./manage.py migrate; \
python3 ./manage.py collectstatic --noinput; \
/usr/bin/supervisord
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon


2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.9.5
django==1.9.13
gunicorn==19.4.5
python-dateutil==2.4.2
ipython==4.1.2
Expand Down

0 comments on commit 835f25b

Please sign in to comment.