From 5d6f23405792f23d24bc152e45f9b11d3f42c708 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 11 Mar 2016 11:52:24 +0000 Subject: [PATCH] fix docker pidfile, may resolve #44 Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 0efac0d13..09a3519f1 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -12,6 +12,8 @@ start() command="${DOCKER_BINARY:-/usr/bin/docker}" + pidfile="/run/docker.pid" + # Start with networking on both Mac and Hyper-V, but in # 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" @@ -28,19 +30,15 @@ start() [ -d /Mac/$d ] && mkdir -p /$d && mount --bind /Mac/$d /$d done - command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}" - DOCKER_LOGFILE="/var/log/docker.log" - pidfile="/run/docker.pid" - start-stop-daemon --start --quiet \ --background \ --exec ${command} \ --pidfile ${pidfile} \ --stderr "${DOCKER_LOGFILE}" \ --stdout "${DOCKER_LOGFILE}" \ - -- ${command_args} + -- daemon --pidfile=${pidfile} ${DOCKER_OPTS} } stop() @@ -51,6 +49,7 @@ stop() start-stop-daemon --stop --quiet --pidfile ${pidfile} # taken from localmount stop script + # XXX fix more cleanly see #35 yesno $RC_GOINGDOWN || return 0 # We never unmount / or /dev or $RC_SVCDIR