github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #157 from justincormack/movemount

Browse Source 
move log mount to hostsettings not docker startup
This commit is contained in:
Justin Cormack 2016-05-27 11:47:39 -07:00
commit 79409e4d00
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,13 +10,6 @@ start()
{ {
ebegin "Starting Docker" 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}" command="${DOCKER_BINARY:-/usr/bin/docker}"
pidfile="/run/docker.pid" pidfile="/run/docker.pid"

7
alpine/packages/hostsettings/etc/init.d/hostsettings
View File

@ -11,5 +11,12 @@ start() {
mobyconfig exists etc/sysctl.conf && mobyconfig get etc/sysctl.conf > /etc/sysctl.conf 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 eend 0
} }