system/docker: Updated for version 0.11.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 30 insertions, 18 deletions

diff --git a/system/docker/README b/system/docker/README
index ecace98aeed5b..a286c28507d16 100644
--- a/system/docker/README
+++ b/system/docker/README
@@ -23,4 +23,19 @@ and to /etc/rc.d/rc.local_shutdown (creating it if needed):
 		/etc/rc.d/rc.docker stop
 	fi
 
+For cgroups, docker does not support mounting cgroups on the "all" single hierarchy controller,
+but rather the individual controllers.
+
+To accomplish this, add the following to your /etc/fstab:
+
+  cgroup                                  /cgroup/cpuset          cgroup          rw,relatime,cpuset 0 0
+  cgroup                                  /cgroup/cpu             cgroup          rw,relatime,cpu 0 0
+  cgroup                                  /cgroup/cpuacct         cgroup          rw,relatime,cpuacct 0 0
+  cgroup                                  /cgroup/memory          cgroup          rw,relatime,memory 0 0
+  cgroup                                  /cgroup/devices         cgroup          rw,relatime,devices 0 0
+  cgroup                                  /cgroup/freezer         cgroup          rw,relatime,freezer 0 0
+  cgroup                                  /cgroup/net_cls         cgroup          rw,relatime,net_cls 0 0
+  cgroup                                  /cgroup/blkio           cgroup          rw,relatime,blkio 0 0
+
+
 NOTE: google-go-lang is only needed at compile time - not needed for runtime.
diff --git a/system/docker/docker-btrfs.patch b/system/docker/docker-btrfs.patch
index ef6c540881034..9d981a48a650c 100644
--- a/system/docker/docker-btrfs.patch
+++ b/system/docker/docker-btrfs.patch
@@ -8,10 +8,10 @@ Date:   Sat Feb 1 21:40:51 2014 -0700
     
     Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 
-diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
+diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
 index a50f11f..3d27909 100644
---- a/graphdriver/btrfs/btrfs.go
-+++ b/graphdriver/btrfs/btrfs.go
+--- a/daemon/graphdriver/btrfs/btrfs.go
++++ b/daemon/graphdriver/btrfs/btrfs.go
 @@ -4,15 +4,11 @@ package btrfs
  
  /*
@@ -29,4 +29,4 @@ index a50f11f..3d27909 100644
 +
  import (
  	"fmt"
- 	"github.com/dotcloud/docker/graphdriver"
+ 	"github.com/dotcloud/docker/daemon/graphdriver"
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild
index ad2748a6ad502..22a7925b343df 100644
--- a/system/docker/docker.SlackBuild
+++ b/system/docker/docker.SlackBuild
@@ -5,18 +5,16 @@
 # Written by Vincent Batts <vbatts@hashbangbash.com>
 
 PRGNAM=docker
-VERSION=${VERSION:-0.9.1}
+VERSION=${VERSION:-0.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-GITHASH=${GITHASH:-867b2a9}
+GITHASH=${GITHASH:-fb99f99}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -49,11 +47,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/v${VERSION}.tar.gz || tar xvz $PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 unset GOPATH
 
@@ -79,8 +77,7 @@ install -D --mode 0644 $CWD/config/docker.logrotate $PKG/etc/logrotate.d/docker.
 install -D --mode 0755 $CWD/config/rc.docker $PKG/etc/rc.d/rc.docker.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS CONTRIBUTING.md CHANGELOG.md FIXME LICENSE README.md NOTICE VERSION \
+cp -a AUTHORS CONTRIBUTING.md CHANGELOG.md FIXME LICENSE README.md NOTICE VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/docker/docker.info b/system/docker/docker.info
index a705642a931dd..d6b1688429654 100644
--- a/system/docker/docker.info
+++ b/system/docker/docker.info
@@ -1,8 +1,8 @@
 PRGNAM="docker"
-VERSION="0.9.1"
+VERSION="0.11.1"
 HOMEPAGE="https://docker.io/"
-DOWNLOAD="https://github.com/dotcloud/docker/archive/v0.9.1.tar.gz"
-MD5SUM="194ee07653abb984bbbab0cf0f3b98f3"
+DOWNLOAD="https://github.com/dotcloud/docker/archive/v0.11.1.tar.gz"
+MD5SUM="6496901bfc30aa8094411a0dd6c10ab5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"