Fix docker hang

mblaschke · mblaschke · commit ebc065f64911 · 2016-12-18T15:45:58.000+01:00
Fix stdout
Introducted /docker.stderr
diff --git a/docker/base/alpine-3/conf/bin/entrypoint.sh b/docker/base/alpine-3/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/centos-7/conf/bin/entrypoint.sh b/docker/base/centos-7/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/base/debian-7/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/debian-7/conf/etc/supervisor.conf b/docker/base/debian-7/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/base/debian-8/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/debian-8/conf/etc/supervisor.conf b/docker/base/debian-8/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/base/debian-9/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/debian-9/conf/etc/supervisor.conf b/docker/base/debian-9/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf
@@ -1,6 +1,5 @@
 [supervisord]
 nodaemon=true
-logfile = /docker.stdout
 
 [unix_http_server]
 file = /var/run/supervisor.sock
diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -74,8 +74,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'clear_env',                   value: "no" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -74,8 +74,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'clear_env',                   value: "no" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -74,8 +74,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'clear_env',                   value: "no" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
@@ -39,5 +39,5 @@
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
-   - { key: 'error_log', value: "/docker.stdout" }
+   - { key: 'error_log', value: "syslog" }
    - { key: 'pid',       value: "/var/run/php-fpm.pid" }
diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -73,8 +73,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
    - { key: 'group',                       value: "{{ APPLICATION_GROUP }}" }
diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
@@ -74,8 +74,8 @@
    - { key: 'catch_workers_output',        value: "yes" }
    - { key: 'access.format',               value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
    - { key: 'access.log',                  value: "/docker.stdout" }
-   - { key: 'slowlog',                     value: "/docker.stdout" }
-   - { key: 'php_admin_value[error_log]',  value: "/docker.stdout" }
+   - { key: 'slowlog',                     value: "/docker.stderr" }
+   - { key: 'php_admin_value[error_log]',  value: "/docker.stderr" }
    - { key: 'php_admin_value[log_errors]', value: "on" }
    - { key: 'clear_env',                   value: "no" }
    - { key: 'user',                        value: "{{ APPLICATION_USER }}" }
diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.sh
@@ -9,8 +9,9 @@ trap 'echo sigterm ; exit' SIGTERM
 trap 'echo sigkill ; exit' SIGKILL
 
 # link stdout from docker
-ln -f -s "/proc/$$/fd/0" /docker.stdout
-chmod 600 /docker.stdout
+ln -f -s "/proc/$$/fd/1" /docker.stdout
+ln -f -s "/proc/$$/fd/2" /docker.stderr
+chmod 600 /docker.stdout /docker.stderr
 
 # sanitize input and set task
 TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.conf b/docker/samson-deployment/latest/conf/etc/supervisor.conf
diff --git a/provisioning/base/general/bin/entrypoint.sh b/provisioning/base/general/bin/entrypoint.sh
diff --git a/provisioning/base/general/etc/supervisor.conf b/provisioning/base/general/etc/supervisor.conf
diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml
diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
diff --git a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml
