diff --git a/alpine/etc/conf.d/syslog b/alpine/etc/conf.d/syslog deleted file mode 100644 index 53ccb79d4..000000000 --- a/alpine/etc/conf.d/syslog +++ /dev/null @@ -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 diff --git a/alpine/etc/syslog.conf b/alpine/etc/syslog.conf new file mode 100644 index 000000000..b74275b6c --- /dev/null +++ b/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 diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 2d47866b4..e2e366f73 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/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