diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 9cfe8c8fe..aef7f1f29 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -42,7 +42,7 @@ start() export no_proxy="$(mobyconfig get proxy/exclude)" fi - grep -q "osxfs /tmp" /etc/mtab || ( [ -d /Mac/tmp ] && mount --bind /Mac/tmp /tmp ) + grep -q "osxfs /tmp" /proc/mounts || ( [ -d /Mac/tmp ] && mount --bind /Mac/tmp /tmp ) for d in Users Volumes private do @@ -54,7 +54,11 @@ start() 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" /proc/mounts || mount --bind "${DRIVERDIR}/log" /var/log + if ! grep -q "osxfs on /var/log" /proc/mounts ; then + mkdir /run/log + mount -o bind /var/log /run/log + mount --bind "${DRIVERDIR}/log" /var/log + fi fi # same default ulimit as boot2docker; if you want more can set at docker run time