From 9e8841477332f2074f10c2ce83e6067d44a97cba Mon Sep 17 00:00:00 2001
From: jakedt <jake@devtable.com>
Date: Thu, 17 Apr 2014 12:29:23 -0400
Subject: [PATCH] Move the pid files inside the container so they don't
 conflict.

---
 Dockerfile              | 3 +++
 conf/gunicorn_config.py | 2 +-
 conf/root-base.conf     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bc64a73f8..d6857ace8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV HOME /root
 
 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
 
 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 rm -rf /conf/stack
 VOLUME ["/conf/stack", "/mnt/logs"]
 
 EXPOSE 443 80
diff --git a/conf/gunicorn_config.py b/conf/gunicorn_config.py
index 162c617b9..a74f95786 100644
--- a/conf/gunicorn_config.py
+++ b/conf/gunicorn_config.py
@@ -2,7 +2,7 @@ bind = 'unix:/tmp/gunicorn.sock'
 workers = 8
 worker_class = 'gevent'
 timeout = 2000
-pidfile = '/mnt/logs/gunicorn.pid'
+pidfile = '/tmp/gunicorn.pid'
 errorlog = '/mnt/logs/application.log'
 loglevel = 'debug'
 logger_class = 'util.glogger.LogstashLogger'
diff --git a/conf/root-base.conf b/conf/root-base.conf
index 16a63fda0..b4b9beb90 100644
--- a/conf/root-base.conf
+++ b/conf/root-base.conf
@@ -1,4 +1,4 @@
-pid /mnt/logs/nginx.pid;
+pid /tmp/nginx.pid;
 error_log /mnt/logs/nginx.error.log;
 
 events {