github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-31 06:32:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #743 from justincormack/no-bind-log

Browse Source 
Do not try to bind mount logs onto host on osx
This commit is contained in:
Justin Cormack 2016-11-18 10:43:50 +00:00 committed by GitHub
commit 2759c51105
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
alpine/packages/docker/etc/init.d/docker
View File

@ -98,18 +98,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