vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move the pid files inside the container so they don't conflict.

Browse source
This commit is contained in:
jakedt 2014-04-17 12:29:23 -04:00
parent 91c1342ffb
commit 9e88414773
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -4,6 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive
ENV HOME /root ENV HOME /root
RUN apt-get update RUN apt-get update
# New ubuntu packages should be added as their own apt-get install lines below the existing install commands
RUN apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev libevent-dev gdebi-core g++ libmagic1 RUN apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev libevent-dev gdebi-core g++ libmagic1
ADD binary_dependencies binary_dependencies ADD binary_dependencies binary_dependencies
@ -42,6 +44,7 @@ ADD conf/init/webhookworker.sh /etc/service/webhookworker/run
RUN TEST=true venv/bin/python -m unittest discover RUN TEST=true venv/bin/python -m unittest discover
RUN rm -rf /conf/stack
VOLUME ["/conf/stack", "/mnt/logs"] VOLUME ["/conf/stack", "/mnt/logs"]
EXPOSE 443 80 EXPOSE 443 80

2
conf/gunicorn_config.py
View file

@ -2,7 +2,7 @@ bind = 'unix:/tmp/gunicorn.sock'
workers = 8 workers = 8
worker_class = 'gevent' worker_class = 'gevent'
timeout = 2000 timeout = 2000
pidfile = '/mnt/logs/gunicorn.pid' pidfile = '/tmp/gunicorn.pid'
errorlog = '/mnt/logs/application.log' errorlog = '/mnt/logs/application.log'
loglevel = 'debug' loglevel = 'debug'
logger_class = 'util.glogger.LogstashLogger' logger_class = 'util.glogger.LogstashLogger'

2
conf/root-base.conf
View file

@ -1,4 +1,4 @@
pid /mnt/logs/nginx.pid; pid /tmp/nginx.pid;
error_log /mnt/logs/nginx.error.log; error_log /mnt/logs/nginx.error.log;
events { events {