From f77dab0bead5313c65cb5212799196abbc708fcb Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Mon, 24 Feb 2020 13:50:25 +0100
Subject: [PATCH] fixed logging for php errors

---
 Dockerfile    | 3 ++-
 DockerfileDev | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 09d993697..c4f36fa69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,9 +29,10 @@ RUN apk add --update \
 
 WORKDIR /html
 
-RUN sed -i 's/;error_log = log\/php7\/error.log/error_log = \/dev\/stdout/g' /etc/php7/php-fpm.conf && \
+RUN sed -i 's/;error_log = log\/php7\/error.log/error_log = \/dev\/stderr/g' /etc/php7/php-fpm.conf && \
     sed -i 's/;daemonize = yes/daemonize = no/g' /etc/php7/php-fpm.conf && \
     sed -i 's/listen = 127.0.0.1:9000/listen = 9000/g' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/;decorate_workers_output = no/decorate_workers_output = no/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/;catch_workers_output = yes/catch_workers_output = yes/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/user = nobody/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/group = nobody/group = nginx/g' /etc/php7/php-fpm.d/www.conf && \
diff --git a/DockerfileDev b/DockerfileDev
index 18748bf88..771ca5963 100644
--- a/DockerfileDev
+++ b/DockerfileDev
@@ -29,9 +29,10 @@ RUN apk add --update \
 
 WORKDIR /html
 
-RUN sed -i 's/;error_log = log\/php7\/error.log/error_log = \/dev\/stdout/g' /etc/php7/php-fpm.conf && \
+RUN sed -i 's/;error_log = log\/php7\/error.log/error_log = \/dev\/stderr/g' /etc/php7/php-fpm.conf && \
     sed -i 's/;daemonize = yes/daemonize = no/g' /etc/php7/php-fpm.conf && \
     sed -i 's/listen = 127.0.0.1:9000/listen = 9000/g' /etc/php7/php-fpm.d/www.conf && \
+    sed -i 's/;decorate_workers_output = no/decorate_workers_output = no/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/;catch_workers_output = yes/catch_workers_output = yes/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/user = nobody/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \
     sed -i 's/group = nobody/group = nginx/g' /etc/php7/php-fpm.d/www.conf && \
-- 
GitLab