From ef66fc795716cce1e35ab4ce0e11195f57ebd4a7 Mon Sep 17 00:00:00 2001
From: James Mills <prologic@shortcircuit.net.au>
Date: Fri, 28 Feb 2014 00:27:10 +1000
Subject: [PATCH] docker: 0.8.0 -> 0.8.1

--HG--
extra : rebase_source : f2e3e008cc07946a12a9a2b635d98f2a20bdf3a8
---
 docker/.md5sum               |  2 +-
 docker/Pkgfile               | 20 +++-----
 docker/docker.rc             |  1 +
 docker/test_kernel_config.sh | 94 +++++++++++++++++++++++-------------
 4 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/docker/.md5sum b/docker/.md5sum
index 866390ffc..c426eeb69 100644
--- a/docker/.md5sum
+++ b/docker/.md5sum
@@ -1,3 +1,3 @@
 966e1916d611427c44686ad09145996f  docker.conf
 dcaae2f852c97ba73436c77cda3eb4e3  docker.rc
-737aec190c2ad81b00192f858f9ed31b  v0.8.0.tar.gz
+3e74f5af4a74f3448a1db5763e455eb9  v0.8.1.tar.gz
diff --git a/docker/Pkgfile b/docker/Pkgfile
index a1ded460e..d3f952090 100644
--- a/docker/Pkgfile
+++ b/docker/Pkgfile
@@ -6,33 +6,27 @@
 # Depends on:   go bridge-utils lxc sqlite3
 
 name=docker
-version=0.8.0
-revision=cc3a8c8d8e
-release=2
+version=0.8.1
+revision=a1598d1e1c
+release=1
 source=(
     https://github.com/dotcloud/$name/archive/v$version.tar.gz
     $name.rc
     $name.conf
 )
 
-_magic=src/github.com/dotcloud
-
 build() {
-    # symlink vendor packages
-    mkdir -p "$SRC/$_magic"
-    ln -sfn "../../../$name-$version" "$_magic/docker"
-
     cd $name-$version
 
     # Build
-    export GOPATH="$SRC:$SRC/$_magic/docker/vendor"
+    export AUTO_GOPATH=1
     export DOCKER_GITCOMMIT=$revision
     ./hack/make.sh dynbinary
 
     # Package
-    install -Dm755 "bundles/$version/dynbinary/docker-$version" "$PKG/usr/bin/docker"
-    install -Dm755 "bundles/$version/dynbinary/dockerinit-$version" "$PKG/usr/lib/docker/dockerinit"
-    install -Dm644 "contrib/udev/80-docker.rules" "$PKG/etc/udev/rules.d/80-docker.rules"
+    install -D -m 755 "bundles/$version/dynbinary/docker-$version" "$PKG/usr/bin/docker"
+    install -D -m 755 "bundles/$version/dynbinary/dockerinit-$version" "$PKG/usr/lib/docker/dockerinit"
+    install -D -m 644 "contrib/udev/80-docker.rules" "$PKG/etc/udev/rules.d/80-docker.rules"
     install -D -m 755 $SRC/$name.rc $PKG/etc/rc.d/$name
     install -D -m 644 $SRC/$name.conf $PKG/etc/$name.conf
 
diff --git a/docker/docker.rc b/docker/docker.rc
index 4298b6bf3..bfd10b774 100755
--- a/docker/docker.rc
+++ b/docker/docker.rc
@@ -10,6 +10,7 @@ start)
     nohup /usr/bin/docker $DOCKER_OPTS &> /var/log/docker.log &
     touch /var/run/docker.sock
     chgrp docker /var/run/docker.sock
+    chmod 660 /var/run/docker.sock
     ;;
 stop)
     if [ -f /var/run/docker.pid ]; then
diff --git a/docker/test_kernel_config.sh b/docker/test_kernel_config.sh
index 713df59ac..62eaef148 100755
--- a/docker/test_kernel_config.sh
+++ b/docker/test_kernel_config.sh
@@ -5,6 +5,60 @@
 #
 # USAGE: ./testconfig.sh [ /path/to/kernel/config ]
 
+
+NETWORKING_MODULES=(
+    ^CONFIG_BRIDGE\=[ym]$
+    ^CONFIG_NETFILTER_XT_MATCH_ADDRTYPE\=[ym]$
+    ^CONFIG_NF_NAT\=[ym]$
+    ^CONFIG_NF_NAT_IPV4\=[ym]$
+    ^CONFIG_NF_NAT_NEEDED\=[ym]$
+)
+
+LVM_MODULES=(
+    ^CONFIG_BLK_DEV_DM\=[ym]$
+    ^CONFIG_DM_THIN_PROVISIONING\=[ym]$
+    ^CONFIG_EXT4_FS\=[ym]$
+)
+
+NAMESPACE_MODULES=(
+    ^CONFIG_NAMESPACES\=[ym]$
+    ^CONFIG_UTS_NS\=[ym]$
+    ^CONFIG_IPC_NS\=[ym]$
+    ^CONFIG_PID_NS\=[ym]$
+    ^CONFIG_NET_NS\=[ym]$
+)
+
+CGROUPS_MODULES=(
+    ^CONFIG_CGROUPS\=[ym]$
+)
+
+CGROUPS_CONTROLLERS_MODULES=(
+    ^CONFIG_CGROUP_CPUACCT\=[ym]$
+    ^CONFIG_BLK_CGROUP\=[ym]$
+    ^CONFIG_MEMCG\=[ym]$
+    ^CONFIG_MEMCG_SWAP\=[ym]$
+)
+
+
+function test_config() {
+    local desc=${1}
+    local -a modules=("${@:2}")
+
+    echo "Checking $desc:"
+
+    for module in ${modules[@]}; do
+        echo -n " $module "
+        if [[ $(egrep $module $CONFIG) ]]; then
+            echo "OK"
+        else
+            echo "ERR"
+            exit 1
+        fi
+    done
+    echo
+}
+
+
 if [[ $# -lt 1 ]]; then
     if [[ -e /proc/config.gz ]]; then
         CONFIG=$(mktemp)
@@ -17,39 +71,11 @@ else
     CONFIG=${1}
 fi
 
-echo "Checking Networking:"
-egrep "CONFIG_BRIDGE=.$" $CONFIG
-egrep "CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=.$" $CONFIG
-egrep "CONFIG_NF_NAT=.$" $CONFIG
-egrep "CONFIG_NF_NAT_IPV4=.$" $CONFIG
-egrep "CONFIG_NF_NAT_NEEDED=.$" $CONFIG
-echo
 
-echo "Checking LVM:"
-egrep CONFIG_BLK_DEV_DM $CONFIG
-egrep CONFIG_DM_THIN_PROVISIONING $CONFIG
-egrep CONFIG_EXT4_FS $CONFIG
-echo
+test_config "Networking" "${NETWORKING_MODULES[@]}"
+test_config "LVM" "${LVM_MODULES[@]}"
+test_config "Namespaces" "${NAMESPACE_MODULES[@]}"
+test_config "CGroups" "${CGROUPS_MODULES[@]}"
+test_config "CGroups Controllers" "${CGROUPS_CONTROLLERS_MODULES[@]}"
 
-echo "Checking Namespaces:"
-egrep CONFIG_NAMESPACES $CONFIG
-egrep CONFIG_UTS_NS $CONFIG
-egrep CONFIG_IPC_NS $CONFIG
-egrep CONFIG_UID_NS $CONFIG
-egrep CONFIG_PID_NS $CONFIG
-egrep CONFIG_NET_NS $CONFIG
-echo
-
-echo "Checking Cgroups:"
-egrep CONFIG_CGROUPS $CONFIG
-echo
-
-echo "Checkin gCgroup controllers (optional but highly recommended):"
-egrep CONFIG_CGROUP_CPUACCT $CONFIG
-egrep CONFIG_BLK_CGROUP $CONFIG
-egrep CONFIG_MEMCG $CONFIG
-egrep CONFIG_MEMCG_SWAP $CONFIG
-echo 
-
-echo "Running lxc-checkconfig:"
-CONFIG=$CONFIG /usr/bin/lxc-checkconfig
+echo "You are ready to Docker rock 'n roll!"