diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2015-08-12 19:01:36 +1000 |
|---|---|---|
| committer | James Mills <prologic@shortcircuit.net.au> | 2015-08-12 19:01:36 +1000 |
| commit | 525ff9a85f5a86357849b836c989f439e6eeb447 (patch) | |
| tree | 05b311e3774649c078bfdf534608095aa292f403 /docker | |
| parent | 6c9f13e56e80e89b5244c10bd1830602d541489b (diff) | |
| download | contrib-525ff9a85f5a86357849b836c989f439e6eeb447.tar.gz contrib-525ff9a85f5a86357849b836c989f439e6eeb447.tar.xz | |
docker: 1.8.0
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/.md5sum | 2 | ||||
| -rw-r--r-- | docker/Pkgfile | 4 | ||||
| -rwxr-xr-x | docker/docker | 2 | ||||
| -rw-r--r-- | docker/docker.conf | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docker/.md5sum b/docker/.md5sum index 126d84faf..1f38cc071 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,4 +1,4 @@ 69858e8f5c2f47bae23aae6a11822e55 check-config.sh e3601957bbb866eb53ead26221779ff8 docker 223f19d2f5a6792499c1be3916855057 docker.conf -2172ddbd262a8be814759a47409fed8d v1.7.1.tar.gz +aef944123b35eebc275f14c800ba5fa5 v1.8.0.tar.gz diff --git a/docker/Pkgfile b/docker/Pkgfile index 04eb43500..21290245f 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -5,8 +5,8 @@ # Depends on: go sqlite3 cgroupfs-mount start-stop-daemon name=docker -version=1.7.1 -revision=786b29d4db +version=1.8.0 +revision=0d03096b65 release=1 source=( https://raw.githubusercontent.com/docker/docker/v${version}/contrib/check-config.sh diff --git a/docker/docker b/docker/docker index f15a77eaf..dc68e3eb8 100755 --- a/docker/docker +++ b/docker/docker @@ -20,7 +20,7 @@ start) # Ensure cgroups is properly mounted. cgroupfs-mount - $SSD --start --background --make-pidfile --pidfile $PIDFILE --exec $PROG -- $OPTS >> $LOGFILE 2>&1 + $SSD --start --background --make-pidfile --pidfile $PIDFILE --exec $PROG -- daemon $OPTS >> $LOGFILE 2>&1 ;; stop) $SSD --stop --retry 10 --pidfile $PIDFILE diff --git a/docker/docker.conf b/docker/docker.conf index f6200bb18..40d5691e3 100644 --- a/docker/docker.conf +++ b/docker/docker.conf @@ -1,7 +1,7 @@ # Docker Daemon Configuration # -# For configuration options see: docker --help +# For configuration options see: docker daemon --help -OPTS="-d -p /var/run/docker.pid" +OPTS="" # vim: syntax=sh |