From 5da9891c8b6d63889f9454b8bf015229f3d697d3 Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 17 Feb 2016 13:49:41 +0000 Subject: [PATCH 1/2] docker: write ip in `groupDir`, not `driverDir` Signed-off-by: David Scott --- alpine/packages/docker/etc/init.d/docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 88650af99..50e907647 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -10,9 +10,9 @@ pidfile="/run/docker.pid" # future change this to use a hypervisor socket. DOCKER_OPTS="${DOCKER_OPTS} -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock" -if cat /proc/cmdline | grep -q 'com.docker.driverDir' +if cat /proc/cmdline | grep -q 'com.docker.groupDir' then - DRIVER="$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" + DRIVER="$(cat /proc/cmdline | sed -e 's/.*com.docker.groupDir="//' -e 's/".*//')" INET=$(ifconfig eth0 2> /dev/null | grep 'inet addr' | cut -f 2 -d ":" | cut -f 1 -d " ") echo $INET > "/Mac/$DRIVER/ip" fi From a049d233d215681dbe7a68d238f07c6356ac4d0a Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 17 Feb 2016 13:50:54 +0000 Subject: [PATCH 2/2] Bind mount ${groupDir}/log as /var/log Before this patch we would bind mount ${groupDir} as /var/log, but we wish to put data files in the group dir, so we should move the logs to a subdirectory. Signed-off-by: David Scott --- alpine/packages/hostlog/etc/init.d/hostlog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/packages/hostlog/etc/init.d/hostlog b/alpine/packages/hostlog/etc/init.d/hostlog index f773ac8c0..1c8d2c834 100755 --- a/alpine/packages/hostlog/etc/init.d/hostlog +++ b/alpine/packages/hostlog/etc/init.d/hostlog @@ -14,7 +14,7 @@ start() GROUPDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.groupDir="//' -e 's/".*//')" - mount --bind "${GROUPDIR}" /var/log + mount --bind "${GROUPDIR}/log" /var/log eend $? "Failed to redirect logs to host" }