From 66c03d8cd540e8f07f5a8dab0e6fa62efcf2d5c4 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 16 Nov 2016 16:08:03 +0000 Subject: [PATCH] Do not try to bind mount logs onto host on osx This is not working well, and was binding over the logs, and losing logs. We need a uniform approach on all platforms, planned to be syslog. Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index f5002ae92..0fcfb797c 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -92,18 +92,6 @@ start() DOCKER_OPTS="${DOCKER_OPTS} --storage-driver ${STORAGE_DRIVER}" fi - # shift logs onto host before docker starts - # busybox reopens its log files every second - if cat /proc/cmdline | grep -q 'com.docker.driver' - then - DRIVERDIR="/host_docker_app/$(cat /proc/cmdline | sed -e 's/.*com.docker.driver="//' -e 's/".*//')" - if ! grep -q "osxfs on /var/log" /proc/mounts ; then - mkdir -p /run/log - mount -o bind /var/log /run/log - mount --bind "${DRIVERDIR}/log" /var/log - fi - fi - # set ulimits as high as possible ulimit -n 1048576 ulimit -p unlimited