docker: 1.5.0 -> 1.6.0

6 files changed, 36 insertions, 38 deletions

diff --git a/docker/.md5sum b/docker/.md5sum
index 7132b3151..30d49c729 100644
--- a/docker/.md5sum
+++ b/docker/.md5sum
@@ -1,4 +1,4 @@
 69858e8f5c2f47bae23aae6a11822e55  check-config.sh
-849b268387b3a23ce4e0b0bdf0c342d4  docker
-5a4c44dc046f863f60bba02080d66fd1  docker.conf
-a622207cd9eb21d95333501d2495ef5d  v1.5.0.tar.gz
+e3601957bbb866eb53ead26221779ff8  docker
+223f19d2f5a6792499c1be3916855057  docker.conf
+a7d81b566e3003698003506516ad932e  v1.6.0.tar.gz
diff --git a/docker/Pkgfile b/docker/Pkgfile
index 2f8954388..0f73356bc 100644
--- a/docker/Pkgfile
+++ b/docker/Pkgfile
@@ -2,12 +2,12 @@
 # URL:          http://www.docker.com/
 # Maintainer:   James Mills, prologic at shortcircuit dot net dot au
 #
-# Depends on:   go sqlite3 cgroupfs-mount
+# Depends on:   go sqlite3 cgroupfs-mount start-stop-daemon
 
 name=docker
-version=1.5.0
-revision=a8a31eff10
-release=5
+version=1.6.0
+revision=47496519da
+release=1
 source=(
     https://raw.githubusercontent.com/docker/docker/v${version}/contrib/check-config.sh
     https://github.com/docker/docker/archive/v$version.tar.gz
diff --git a/docker/UPGRADE b/docker/UPGRADE
index bc4abbc07..8c608af7d 100644
--- a/docker/UPGRADE
+++ b/docker/UPGRADE
@@ -1,18 +1,8 @@
-Upgrade Notes for Docker 1.5.0
+Upgrade Notes for Docker 1.6.0
 ==============================
 
-Docker 1.5.0 introduced several new features.
+Docker 1.6.0 introduced several new features.
 
-.. see:: http://docs.docker.com/release-notes/#version-150
+.. see:: https://blog.docker.com/2015/04/docker-release-1-6/
 
-As such several new Kernel configuration options
-are **required**:
-
-- ``CONFIG_CGROUP_FREEZER=y``
-- ``CONFIG_CPUSETS=y``
-- ``CONFIG_CGROUP_PERF=y``
-- ``CONFIG_POSIX_MQUEUE=y``
-
-Please make sure when you're upgrading your Docker engine
-that you ensure these new Kernel configuration options
-are enabled.
+No kernel changes required.
diff --git a/docker/docker b/docker/docker
index 92fbbe93c..f15a77eaf 100755
--- a/docker/docker
+++ b/docker/docker
@@ -3,31 +3,27 @@
 # /etc/rc.d/docker: start/stop docker daemon
 #
 
-export PATH="/sbin:/usr/sbin:$PATH"
+SSD=/sbin/start-stop-daemon
+PROG=/usr/bin/docker
+PIDFILE=/var/run/docker.pid
+LOGFILE=/var/log/docker.log
 
-source /etc/docker.conf
+. /etc/docker.conf
 
 case $1 in
 start)
     # Ensure ownership and permissiong of log file.
-    touch /var/log/docker.log
-    chgrp docker /var/log/docker.log
-    chown 640 /var/log/docker.log
+    touch $LOGFILE
+    chgrp docker $LOGFILE
+    chown 640 $LOGFILE
 
     # Ensure cgroups is properly mounted.
     cgroupfs-mount
 
-    nohup /usr/bin/docker $DOCKER_OPTS > /var/log/docker.log 2>&1 &
+    $SSD --start --background --make-pidfile --pidfile $PIDFILE --exec $PROG -- $OPTS >> $LOGFILE 2>&1
     ;;
 stop)
-    if [ -f /var/run/docker.pid ]; then
-        kill $(< /var/run/docker.pid)
-        rm -f /var/run/docker.pid
-        rm -f /var/run/docker.sock
-    else
-        killall -q /usr/bin/docker
-        rm -f /var/run/docker.sock
-    fi
+    $SSD --stop --retry 10 --pidfile $PIDFILE
 
     # Unmount cgroups is
     cgroupfs-umount
@@ -37,8 +33,20 @@ restart)
     sleep 2
     $0 start
     ;;
+reload)
+    $SSD --stop --pidfile $PIDFILE --signal HUP
+    ;;
+status)
+    $SSD --status --pidfile $PIDFILE
+    case $? in
+	0) echo "$(basename $PROG) is running with pid $(cat $PID)" ;;
+	1) echo "$(basename $PROG) is not running but the pid file $PID exists" ;;
+	3) echo "$(basename $PROG) is not running" ;;
+        4) echo "Unable to determine the program status" ;;
+    esac
+    ;;
 *)
-    echo "usage: $0 [start|stop|restart]"
+    echo "usage: $0 [start|stop|restart|reload|status]"
     ;;
 esac
 
diff --git a/docker/docker.conf b/docker/docker.conf
index 383629da6..f6200bb18 100644
--- a/docker/docker.conf
+++ b/docker/docker.conf
@@ -2,6 +2,6 @@
 #
 # For configuration options see: docker --help
 
-DOCKER_OPTS="-d -p /var/run/docker.pid"
+OPTS="-d -p /var/run/docker.pid"
 
 # vim: syntax=sh
diff --git a/docker/post-install b/docker/post-install
index a75854dbf..1f205cf68 100755
--- a/docker/post-install
+++ b/docker/post-install
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # create docker group
 getent group docker > /dev/null || groupadd -g 142 docker