From 7ba9f13dd0f111b05c8b76f6603e7bc4eb002081 Mon Sep 17 00:00:00 2001
From: David Windell <david@outeredgeuk.com>
Date: Sun, 5 Apr 2015 01:05:45 +0100
Subject: [PATCH] Send PHP-FPM errors to stderr

---
 Dockerfile                          | 2 +-
 nginx-default => nginx-default.conf | 0
 php-fpm.conf                        | 2 +-
 php.ini                             | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename nginx-default => nginx-default.conf (100%)

diff --git a/Dockerfile b/Dockerfile
index 36eb984..3a6b00b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN /build.sh
 
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY nginx-default /etc/nginx/conf.d/default
+COPY nginx-default.conf /etc/nginx/conf.d/default
 COPY php-fpm.conf /usr/local/etc/php-fpm.conf
 COPY php.ini /usr/local/etc/php/php.ini
 
diff --git a/nginx-default b/nginx-default.conf
similarity index 100%
rename from nginx-default
rename to nginx-default.conf
diff --git a/php-fpm.conf b/php-fpm.conf
index 49683cc..2fa1648 100644
--- a/php-fpm.conf
+++ b/php-fpm.conf
@@ -1,7 +1,7 @@
 [global]
 
 daemonize = no
-error_log = stderr
+error_log = /proc/self/fd/2
 
 emergency_restart_threshold = 10
 emergency_restart_interval = 1m
diff --git a/php.ini b/php.ini
index 4c670ed..649ea18 100644
--- a/php.ini
+++ b/php.ini
@@ -1,7 +1,6 @@
 [PHP]
 display_errors = stderr
 short_open_tag = Off
-output_buffering = 4096
 expose_php = Off
 register_argc_argv = Off