Merge pull request #702 from justincormack/syslog

Syslog support for docker logs

alpine/etc/conf.d/syslog

@@ -1,5 +0,0 @@
-# Would prefer to check [ -S /var/run/syslog.vsock ] but it doesn't
-# always exist by the time we get here starts.
-if [ -e /var/run/vsudd.pid -a ! -d /sys/bus/vmbus ] ; then
-    SYSLOGD_OPTS="-R local:/var/run/syslog.vsock"
-fi

alpine/etc/syslog.conf

@@ -0,0 +1,29 @@
+#  /etc/syslog.conf	Configuration file for syslogd.
+#
+#			For more information see syslog.conf(5)
+#			manpage.
+
+# First some standard logfiles.  Log by facility.
+#
+
+auth,authpriv.*			/var/log/auth.log
+*.*;auth,authpriv.none		-/var/log/syslog
+cron.*				/var/log/cron.log
+daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+lpr.*				-/var/log/lpr.log
+mail.*				-/var/log/mail.log
+user.*				-/var/log/user.log
+
+# Local facilities for our programs
+local0.*			-/var/log/docker.log
+
+# Some `catch-all' logfiles.
+#
+*.=debug;\
+	auth,authpriv.none;\
+	news.none;mail.none	-/var/log/debug
+*.=info;*.=notice;*.=warning;\
+	auth,authpriv.none;\
+	cron,daemon.none;\
+	mail,news.none		-/var/log/messages

alpine/packages/docker/etc/init.d/docker

@@ -111,11 +111,9 @@ start()
 
 	start-stop-daemon --start --quiet \
 		--background \
-		--exec ${command} \
+		--startas /bin/sh \
 		--pidfile ${pidfile} \
-		--stderr "${DOCKER_LOGFILE}" \
-		--stdout "${DOCKER_LOGFILE}" \
-		-- --pidfile=${pidfile} ${DOCKER_OPTS}
+		-- -c "exec ${command} --pidfile=${pidfile} ${DOCKER_OPTS} 2>&1 | logger -p local0.info"
 
 	ewaitfile 20 ${pidfile} /var/run/docker.sock /var/run/docker/libcontainerd/docker-containerd.sock