From 31c5b24513cb2be7eac55e68694ce5e9e467b5d3 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 10 Jun 2016 11:26:32 +0100 Subject: [PATCH] remove transfused dependency from hostsettings by putting log mounts in docker startup Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 8 ++++++++ alpine/packages/hostsettings/etc/init.d/hostsettings | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 8672517a7..1fdc5bd8f 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -49,6 +49,14 @@ start() [ -d /Mac/$d ] && [ ! -d $d ] && mkdir -p /$d && mount --bind /Mac/$d /$d done + # shift logs onto host before docker starts + # busybox reopens its log files every second + if cat /proc/cmdline | grep -q 'com.docker.driverDir' + then + DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" + grep -q "osxfs on /var/log" || mount --bind "${DRIVERDIR}/log" /var/log + fi + # same default ulimit as boot2docker; if you want more can set at docker run time DOCKER_ULIMITS=1048576 ulimit -n $DOCKER_ULIMITS diff --git a/alpine/packages/hostsettings/etc/init.d/hostsettings b/alpine/packages/hostsettings/etc/init.d/hostsettings index aaf5d9190..6f05e2f16 100755 --- a/alpine/packages/hostsettings/etc/init.d/hostsettings +++ b/alpine/packages/hostsettings/etc/init.d/hostsettings @@ -3,7 +3,6 @@ description="Configuring settings from database." depend() { - need transfused before sysctl net } @@ -12,14 +11,6 @@ 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 - DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" - mount --bind "${DRIVERDIR}/log" /var/log - fi - mobyconfig exists etc/resolv.conf && mobyconfig get etc/resolv.conf > /etc/resolv.conf # handle static network config if configured