From a597292272b3f5aeeacca34681c7cd11899e1bac Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 27 May 2016 11:41:46 -0700 Subject: [PATCH] move log mount to hostsettings not docker startup Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 7 ------- alpine/packages/hostsettings/etc/init.d/hostsettings | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index ffef1b52e..beaa16909 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -10,13 +10,6 @@ start() { ebegin "Starting Docker" - # shift logs onto host before docker starts - # busybox reopens its log files every second - if cat /proc/cmdline | grep -q 'com.docker.driverDir' - then - mount --bind "${DRIVERDIR}/log" /var/log - fi - command="${DOCKER_BINARY:-/usr/bin/docker}" pidfile="/run/docker.pid" diff --git a/alpine/packages/hostsettings/etc/init.d/hostsettings b/alpine/packages/hostsettings/etc/init.d/hostsettings index 22a04e2de..8920e2a9a 100755 --- a/alpine/packages/hostsettings/etc/init.d/hostsettings +++ b/alpine/packages/hostsettings/etc/init.d/hostsettings @@ -11,5 +11,12 @@ start() { mobyconfig exists etc/sysctl.conf && mobyconfig get etc/sysctl.conf > /etc/sysctl.conf + # shift logs onto host before docker starts + # busybox reopens its log files every second + if cat /proc/cmdline | grep -q 'com.docker.driverDir' + then + mount --bind "${DRIVERDIR}/log" /var/log + fi + eend 0 }