From ab4dc68fc2b1d32643ca3c1170cf121438132a10 Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Wed, 15 Jul 2015 09:02:42 +0000
Subject: [PATCH 1/2] Using stable branch of nginx

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 01e91cb..a97d9e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV DEBIAN_FRONTEND noninteractive
 # Install software requirements
 RUN apt-get update && \
 apt-get install -y software-properties-common && \
-nginx=development && \
+nginx=stable && \
 add-apt-repository ppa:nginx/$nginx && \
 apt-get upgrade -y && \
 BUILD_PACKAGES="supervisor nginx php5-fpm git php5-mysql php5-mysql php-apc php5-curl php5-gd php5-intl php5-mcrypt php5-memcache php5-sqlite php5-tidy php5-xmlrpc php5-xsl php5-pgsql php5-mongo pwgen" && \

From b1ca04a38be105ee0ad9d581f0e97fa4c66c276d Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Wed, 15 Jul 2015 10:04:44 +0000
Subject: [PATCH 2/2] fix supervisord

---
 start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index 45c86d3..502c5b2 100644
--- a/start.sh
+++ b/start.sh
@@ -44,4 +44,4 @@ if [[ "$TEMPLATE_NGINX_HTML" != "0" ]] ; then
 fi
 
 # Start supervisord and services
-/usr/local/bin/supervisord -n -c /etc/supervisord.conf
+/usr/bin/supervisord -n -c /etc/supervisord.conf