github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-26 20:18:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #156 from justincormack/nologcopy

Browse Source 
Do not try to keep log files, fix #154
This commit is contained in:
Justin Cormack 2016-05-26 14:57:53 -07:00
commit a6ceb0a580
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,23 +11,10 @@ start()
ebegin "Starting Docker" ebegin "Starting Docker"
# shift logs onto host before docker starts # shift logs onto host before docker starts
# try to keep initial log files, although there is a race
# busybox reopens its log files every second # busybox reopens its log files every second
if cat /proc/cmdline | grep -q 'com.docker.driverDir' if cat /proc/cmdline | grep -q 'com.docker.driverDir'
then then
DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
rm -rf /var/tmp/log
mkdir -p /var/tmp/log
for f in /var/log/*
do
cp -a $f /var/tmp/log/$(basename $f)
done
mount --bind "${DRIVERDIR}/log" /var/log mount --bind "${DRIVERDIR}/log" /var/log
for f in /var/tmp/log/*
do
[ -f $f ] && cat $f >> /var/log/$(basename $f)
done
rm -rf /var/tmp/log
fi fi
command="${DOCKER_BINARY:-/usr/bin/docker}" command="${DOCKER_BINARY:-/usr/bin/docker}"