summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/docker/README19
-rw-r--r--system/docker/docker.SlackBuild4
-rw-r--r--system/docker/docker.info6
3 files changed, 23 insertions, 6 deletions
diff --git a/system/docker/README b/system/docker/README
index a286c28507..fba86ed3b4 100644
--- a/system/docker/README
+++ b/system/docker/README
@@ -8,7 +8,7 @@ To use docker as a limited user, add your user to the 'docker' group:
# groupadd -r -g 281 docker
# usermod -a -G docker <your_username>
-This will require logging out and back in.
+This will require logging out and back in.
To have the docker daemon start and stop with your host,
add to /etc/rc.d/rc.local:
@@ -38,4 +38,21 @@ To accomplish this, add the following to your /etc/fstab:
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.
+
NOTE: google-go-lang is only needed at compile time - not needed for runtime.
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild
index c84d20eb89..c45efa453a 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.0.1}
+VERSION=${VERSION:-1.1.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-GITHASH=${GITHASH:-990021a}
+GITHASH=${GITHASH:-bd609d2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/system/docker/docker.info b/system/docker/docker.info
index 78f7369563..56262c74f1 100644
--- a/system/docker/docker.info
+++ b/system/docker/docker.info
@@ -1,8 +1,8 @@
PRGNAM="docker"
-VERSION="1.0.1"
+VERSION="1.1.1"
HOMEPAGE="https://docker.io/"
-DOWNLOAD="https://github.com/dotcloud/docker/archive/v1.0.1.tar.gz"
-MD5SUM="61c6c5b7308817a53f1e0f0173f65fe0"
+DOWNLOAD="https://github.com/dotcloud/docker/archive/v1.1.1.tar.gz"
+MD5SUM="2f1fad2a1c696a46bad6823a43897a6c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="google-go-lang"