docker: 0.10.0 -> 0.11.1

docker-bin/.footprint

@@ -5,3 +5,6 @@ drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/docker
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/docker/
+-rwxr-xr-x	root/root	usr/share/docker/check-config.sh

docker-bin/.md5sum

@@ -1,3 +1,4 @@
-2835dbfe778c04ffa6e99121e3115979  docker-0.10.0
+ba2a18cc02218022b2361f0a72015cf0  check-config.sh
+3fc7e007d6637afa11e1632294d7f882  docker-0.11.1
 966e1916d611427c44686ad09145996f  docker.conf
 139afe9c85732d52148035d62810b938  docker.rc

docker-bin/Pkgfile

@@ -2,20 +2,23 @@
 # URL:          http://www.docker.io/
 # Maintainer:   James Mills, prologic at shortcircuit dot net dot au
 #
-# Depends on:   bridge-utils sqlite3 cgroupfs-mount
+# Depends on:   sqlite3 cgroupfs-mount
 
 name=docker-bin
-version=0.10.0
+version=0.11.1
 release=1
 source=(
     https://get.docker.io/builds/Linux/x86_64/docker-$version
+    https://raw.githubusercontent.com/dotcloud/docker/master/contrib/check-config.sh
     docker.rc
     docker.conf
 )
 
 build() {
+    install -D -m 755 $SRC/check-config.sh $PKG/usr/share/docker/check-config.sh
     install -D -m 755 $SRC/docker-$version $PKG/usr/bin/docker
     install -D -m 755 $SRC/docker.rc $PKG/etc/rc.d/docker
     install -D -m 644 $SRC/docker.conf $PKG/etc/docker.conf
+
     chown -R root:root $PKG
 }

docker-bin/README

@@ -4,16 +4,11 @@ Kernel Requirements
 If you want to have a full working CRUX+Docker system you will need to
 rebuild your kernel various networking, cgroups and optional lvm options
 
-Please review the provided ``test_kernel_config.sh`` shell script carefully
-and use this to test your kernel configuration. This README does not document
-what these specific options are to avoid duplication.
-They are listed instead in ``test_kernel_config.sh``.
-
 You may check your kernel configuration by running:
 
 ::
     
-    ./test_kernel_config.sh /usr/src/linux/.config
+    ./check-config.sh /usr/src/linux/.config
          
 
 Execution Engines

docker-bin/test_kernel_config.sh

@@ -1,84 +0,0 @@
-#!/bin/bash
-
-# Script to check Kernel Config
-# Options taken from: http://docs.docker.io/en/latest/installation/kernel/
-#
-# USAGE: ./testconfig.sh [ /path/to/kernel/config ]
-
-
-NETWORKING_MODULES=(
-    ^CONFIG_BRIDGE\=[ym]$
-    ^CONFIG_NETFILTER_XT_MATCH_ADDRTYPE\=[ym]$
-    ^CONFIG_NETFILTER_XT_MATCH_CONNTRACK\=[ym]$
-    ^CONFIG_IP_NF_TARGET_MASQUERADE\=[ym]$
-    ^CONFIG_IP_NF_FILTER\=[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)
-        zcat /proc/config.gz > $CONFIG
-    else
-        echo "Usage: $self [ /path/to/kernel/config ]"
-        exit 1
-    fi
-else
-    CONFIG=${1}
-fi
-
-
-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 "You are ready to Docker rock 'n roll!"

docker/.footprint

@@ -11,3 +11,6 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/docker/
 -rwxr-xr-x	root/root	usr/lib/docker/dockerinit
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/docker/
+-rwxr-xr-x	root/root	usr/share/docker/check-config.sh

docker/.md5sum

@@ -1,3 +1,4 @@
+ba2a18cc02218022b2361f0a72015cf0  check-config.sh
 966e1916d611427c44686ad09145996f  docker.conf
 139afe9c85732d52148035d62810b938  docker.rc
-1a9b569b1627a51b0ce6e85eaad459c4  v0.10.0.tar.gz
+6496901bfc30aa8094411a0dd6c10ab5  v0.11.1.tar.gz

docker/Pkgfile

@@ -2,13 +2,14 @@
 # URL:          http://www.docker.io/
 # Maintainer:   James Mills, prologic at shortcircuit dot net dot au
 #
-# Depends on:   go bridge-utils sqlite3 cgroupfs-mount
+# Depends on:   go sqlite3 cgroupfs-mount
 
 name=docker
-version=0.10.0
+version=0.11.1
-revision=dc9c28f51d
+revision=fb99f992c0
 release=1
 source=(
+    https://raw.githubusercontent.com/dotcloud/docker/master/contrib/check-config.sh
     https://github.com/dotcloud/$name/archive/v$version.tar.gz
     $name.rc
     $name.conf
@@ -25,6 +26,8 @@ build() {
     ./hack/make.sh dynbinary
 
     # Package
+    install -D -m 755 $SRC/check-config.sh $PKG/usr/share/docker/check-config.sh
+
     install -D -m 755 "bundles/$version/dynbinary/docker-$version" \
         "$PKG/usr/bin/docker"
     install -D -m 755 "bundles/$version/dynbinary/dockerinit-$version" \

docker/README

@@ -4,16 +4,11 @@ Kernel Requirements
 If you want to have a full working CRUX+Docker system you will need to
 rebuild your kernel various networking, cgroups and optional lvm options
 
-Please review the provided ``test_kernel_config.sh`` shell script carefully
-and use this to test your kernel configuration. This README does not document
-what these specific options are to avoid duplication.
-They are listed instead in ``test_kernel_config.sh``.
-
 You may check your kernel configuration by running:
 
 ::
     
-    ./test_kernel_config.sh /usr/src/linux/.config
+    ./check-config.sh /usr/src/linux/.config
          
 
 Execution Engines

docker/test_kernel_config.sh

@@ -1,84 +0,0 @@
-#!/bin/bash
-
-# Script to check Kernel Config
-# Options taken from: http://docs.docker.io/en/latest/installation/kernel/
-#
-# USAGE: ./testconfig.sh [ /path/to/kernel/config ]
-
-
-NETWORKING_MODULES=(
-    ^CONFIG_BRIDGE\=[ym]$
-    ^CONFIG_NETFILTER_XT_MATCH_ADDRTYPE\=[ym]$
-    ^CONFIG_NETFILTER_XT_MATCH_CONNTRACK\=[ym]$
-    ^CONFIG_IP_NF_TARGET_MASQUERADE\=[ym]$
-    ^CONFIG_IP_NF_FILTER\=[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)
-        zcat /proc/config.gz > $CONFIG
-    else
-        echo "Usage: $self [ /path/to/kernel/config ]"
-        exit 1
-    fi
-else
-    CONFIG=${1}
-fi
-
-
-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 "You are ready to Docker rock 'n roll!"