docker: 0.9.1 -> 0.10.0

--HG--
extra : rebase_source : 5937873ff254fa3584b783fb90c892f62793714d

3 files changed, 32 insertions, 15 deletions

diff --git a/docker/.md5sum b/docker/.md5sum
index d9f39bfbe..abb004564 100644
--- a/docker/.md5sum
+++ b/docker/.md5sum
@@ -1,3 +1,3 @@
 966e1916d611427c44686ad09145996f  docker.conf
 139afe9c85732d52148035d62810b938  docker.rc
-194ee07653abb984bbbab0cf0f3b98f3  v0.9.1.tar.gz
+1a9b569b1627a51b0ce6e85eaad459c4  v0.10.0.tar.gz
diff --git a/docker/Pkgfile b/docker/Pkgfile
index cc887e675..ffe276518 100644
--- a/docker/Pkgfile
+++ b/docker/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on:   go bridge-utils sqlite3 cgroupfs-mount
 
 name=docker
-version=0.9.1
-revision=3600720a36
-release=2
+version=0.10.0
+revision=dc9c28f51d
+release=1
 source=(
     https://github.com/dotcloud/$name/archive/v$version.tar.gz
     $name.rc
@@ -25,9 +25,13 @@ build() {
     ./hack/make.sh dynbinary
 
     # Package
-    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 "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/README b/docker/README
index d11694b11..7d4d628ed 100644
--- a/docker/README
+++ b/docker/README
@@ -1,10 +1,13 @@
 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
+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 vaoid duplication. They are listed instead in ``test_kernel_config.sh``.
+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:
 
@@ -16,10 +19,14 @@ You may check your kernel configuration by running:
 Execution Engines
 =================
 
-As of Docker 0.9+ execution engines are pluggable and as such Docker no longer depends on lxc.
-The new default execution driver is now an internal ``libcontainer`` driver that replaces the need for lxc.
+As of Docker 0.9+ execution engines are pluggable and as such Docker
+no longer depends on lxc.
 
-Please see the `Docker Documentation <http://docs.docker.io>`_ if you want to use a different execution engine other then the default.
+The new default execution driver is now an internal ``libcontainer``
+driver that replaces the need for lxc.
+
+Please see the `Docker Documentation <http://docs.docker.io>`_
+if you want to use a different execution engine other then the default.
 
 
 Storage Backends
@@ -33,14 +40,20 @@ Docker comes with three main Storage Backends:
 
 It is recommended you use the devmapper or btrfs backend (Default: devmapper).
 
-To use the ``btrfs`` backend edit ``/etc/docker.conf`` and modify the ``DOCKER_OPTS`` with:
+To use the ``btrfs`` backend edit ``/etc/docker.conf``
+and modify the ``DOCKER_OPTS`` with:
 
 ::
     
     DOCKER_OPTS="-s btrfs"
     
+.. note:: As of Docker 0.10.x the ``btrfs`` storage backend is now
+          considered stable and has been promoted to an officially
+          supported storage backend.
+
 
 Docker Client
 =============
 
-Add yourself to the ``docker`` group if you wish to access the Docker daemon on localhost via UNIX Socker.
+Add yourself to the ``docker`` group if you wish to access
+the Docker daemon on localhost via UNIX Socket.