Improve base

Syslog: switch dynamically to pipe() and file() (based on decicion if tty is available or not)
Sypervisor: add example for auth

Author: mblaschke

docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh

@@ -3,3 +3,8 @@
 # then we remove it.
 if [ ! -S /dev/log ]; then rm -f /dev/log; fi
 if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
+
+if [[ ! -p /docker.stdout ]]; then
+    # Switch to file (tty docker mode)
+    rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null
+fi

docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf

@@ -35,7 +35,7 @@ filter f_filter {
 
 destination d_all {
     # syslog-d_all START
-    file("/docker.stdout");
+    pipe("/docker.stdout");
     # syslog-d_all END
 };
 

docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh

@@ -3,3 +3,8 @@
 # then we remove it.
 if [ ! -S /dev/log ]; then rm -f /dev/log; fi
 if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
+
+if [[ ! -p /docker.stdout ]]; then
+    # Switch to file (tty docker mode)
+    rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null
+fi

docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf

@@ -35,7 +35,7 @@ filter f_filter {
 
 destination d_all {
     # syslog-d_all START
-    file("/docker.stdout");
+    pipe("/docker.stdout");
     # syslog-d_all END
 };
 

docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh

@@ -3,3 +3,8 @@
 # then we remove it.
 if [ ! -S /dev/log ]; then rm -f /dev/log; fi
 if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
+
+if [[ ! -p /docker.stdout ]]; then
+    # Switch to file (tty docker mode)
+    rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null
+fi

docker/base/debian-7/conf/etc/supervisor.conf

@@ -3,6 +3,8 @@ nodaemon=true
 
 [unix_http_server]
 file = /var/run/supervisor.sock
+# username = root
+# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf

@@ -35,7 +35,7 @@ filter f_filter {
 
 destination d_all {
     # syslog-d_all START
-    file("/docker.stdout");
+    pipe("/docker.stdout");
     # syslog-d_all END
 };
 

docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh

@@ -3,3 +3,8 @@
 # then we remove it.
 if [ ! -S /dev/log ]; then rm -f /dev/log; fi
 if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
+
+if [[ ! -p /docker.stdout ]]; then
+    # Switch to file (tty docker mode)
+    rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf &> /dev/null
+fi

docker/base/debian-8/conf/etc/supervisor.conf

@@ -3,6 +3,8 @@ nodaemon=true
 
 [unix_http_server]
 file = /var/run/supervisor.sock
+# username = root
+# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf

@@ -35,7 +35,7 @@ filter f_filter {
 
 destination d_all {
     # syslog-d_all START
-    file("/docker.stdout");
+    pipe("/docker.stdout");
     # syslog-d_all END
 };