summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorVincent Batts <vbatts@gmail.com>2014-11-07 15:08:48 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-11-08 06:30:17 +0700
commitcde91ce916433f6d923eb8f9033ba659cb9eeb1e (patch)
tree9cd8da2aad8548375a1430870900229b02887395 /system
parentd54f13fac13f784fa38e33011880684ef66ed767 (diff)
downloadslackbuilds-cde91ce916433f6d923eb8f9033ba659cb9eeb1e.tar.gz
system/docker: Updated for version 1.3.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/docker/README28
-rw-r--r--system/docker/docker.SlackBuild4
-rw-r--r--system/docker/docker.info6
3 files changed, 5 insertions, 33 deletions
diff --git a/system/docker/README b/system/docker/README
index fba86ed3b4..7afec75678 100644
--- a/system/docker/README
+++ b/system/docker/README
@@ -23,34 +23,6 @@ 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
-
-
-And in addition, add to /etc/cgconfig.conf the following:
-
- mount {
- cpuset = /cgroup/cpuset;
- cpu = /cgroup/cpu;
- cpuacct = /cgroup/cpuacct;
- memory = /cgroup/memory;
- devices = /cgroup/devices;
- freezer = /cgroup/freezer;
- net_cls = /cgroup/net_cls;
- blkio = /cgroup/blkio;
- }
-
If you are interested in enabling cgroup memory resource controll over swap as
well, then append "swapaccount=1" to your kernel's parameters. This is often in
/etc/lilo.conf, on the "append" variable.
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild
index e3276c2c43..116ef5aa60 100644
--- a/system/docker/docker.SlackBuild
+++ b/system/docker/docker.SlackBuild
@@ -5,11 +5,11 @@
# Written by Vincent Batts <vbatts@hashbangbash.com>
PRGNAM=docker
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-GITHASH=${GITHASH:-c78088f}
+GITHASH=${GITHASH:-4e9bbfa}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/system/docker/docker.info b/system/docker/docker.info
index 4cb414374b..fdcd39f72e 100644
--- a/system/docker/docker.info
+++ b/system/docker/docker.info
@@ -1,8 +1,8 @@
PRGNAM="docker"
-VERSION="1.3.0"
+VERSION="1.3.1"
HOMEPAGE="https://docker.io/"
-DOWNLOAD="https://github.com/docker/docker/archive/v1.3.0.tar.gz"
-MD5SUM="9fb2716980f5602d0fbb7da8cf71f8f6"
+DOWNLOAD="https://github.com/docker/docker/archive/v1.3.1.tar.gz"
+MD5SUM="098c366f9c8eb82ba537b93eec66303e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="google-go-lang"