up to 18.03.1

[packages/docker-ce.git] / docker.init

diff --git a/docker.init b/docker.init
index d7de87821df2996628423f092ef99af366dfe202..a3ee788a676883934ea1261087a9e025a4815c83 100755 (executable)
--- a/docker.init
+++ b/docker.init
@@ -28,6 +28,8 @@ else
        exit 0
 fi
 
+DOCKER_LOGFILE=/var/log/docker.log
+
 # Get service config - may override defaults
 [ -f /etc/sysconfig/docker ] && . /etc/sysconfig/docker
 
@@ -40,8 +42,19 @@ start() {
                return
        fi
 
+       # NOTE: docker daemon actually doesn't go to background, need to do that ourselves
+       # https://github.com/docker/docker/issues/2758
+
        msg_starting "Docker"
-       daemon --fork /usr/bin/docker -d
+
+       touch "$DOCKER_LOGFILE"
+       chgrp docker "$DOCKER_LOGFILE"
+
+       export DOCKER_LOGFILE
+       daemon \
+               --fork --pidfile $pidfile --waitfortime 60 \
+               /usr/lib/dockerd $OPTIONS
+
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/docker
 }
@@ -54,7 +67,7 @@ stop() {
 
        # Stop daemons.
        msg_stopping "Docker"
-       killproc --pidfile $pidfile docker -TERM
+       killproc --pidfile $pidfile docker
        rm -f /var/lock/subsys/docker
 }