瀏覽代碼

Docs: update install pages (ubuntu and kernel requirements) to reflect the optional nature of AUFS

Solomon Hykes 11 年之前
父節點
當前提交
aaefb8c07c
共有 2 個文件被更改,包括 8 次插入21 次删除
  1. 2 13
      docs/sources/installation/kernel.rst
  2. 6 8
      docs/sources/installation/ubuntulinux.rst

+ 2 - 13
docs/sources/installation/kernel.rst

@@ -11,10 +11,10 @@ In short, Docker has the following kernel requirements:
 
 
 - Linux version 3.8 or above.
 - Linux version 3.8 or above.
 
 
-- `AUFS support <http://aufs.sourceforge.net/>`_.
-
 - Cgroups and namespaces must be enabled.
 - Cgroups and namespaces must be enabled.
 
 
+*Note: as of 0.7 docker no longer requires aufs. AUFS support is still available as an optional driver.*
+
 The officially supported kernel is the one recommended by the
 The officially supported kernel is the one recommended by the
 :ref:`ubuntu_linux` installation path. It is the one that most developers
 :ref:`ubuntu_linux` installation path. It is the one that most developers
 will use, and the one that receives the most attention from the core
 will use, and the one that receives the most attention from the core
@@ -58,17 +58,6 @@ detects something older than 3.8.
 See issue `#407 <https://github.com/dotcloud/docker/issues/407>`_ for details.
 See issue `#407 <https://github.com/dotcloud/docker/issues/407>`_ for details.
 
 
 
 
-AUFS support
-------------
-
-Docker currently relies on AUFS, an unioning filesystem.
-While AUFS is included in the kernels built by the Debian and Ubuntu
-distributions, is not part of the standard kernel. This means that if
-you decide to roll your own kernel, you will have to patch your
-kernel tree to add AUFS. The process is documented on
-`AUFS webpage <http://aufs.sourceforge.net/>`_.
-
-
 Cgroups and namespaces
 Cgroups and namespaces
 ----------------------
 ----------------------
 
 

+ 6 - 8
docs/sources/installation/ubuntulinux.rst

@@ -14,16 +14,11 @@ Ubuntu Linux
 
 
 .. include:: install_header.inc
 .. include:: install_header.inc
 
 
-Right now, the officially supported distribution are:
+Docker is supported on the following versions of Ubuntu:
 
 
 - :ref:`ubuntu_precise`
 - :ref:`ubuntu_precise`
 - :ref:`ubuntu_raring`
 - :ref:`ubuntu_raring`
 
 
-Docker has the following dependencies
-
-* Linux kernel 3.8 (read more about :ref:`kernel`)
-* AUFS file system support (we are working on BTRFS support as an alternative)
-
 Please read :ref:`ufw`, if you plan to use `UFW (Uncomplicated
 Please read :ref:`ufw`, if you plan to use `UFW (Uncomplicated
 Firewall) <https://help.ubuntu.com/community/UFW>`_
 Firewall) <https://help.ubuntu.com/community/UFW>`_
 
 
@@ -107,10 +102,13 @@ Ubuntu Raring 13.04 (64 bit)
 Dependencies
 Dependencies
 ------------
 ------------
 
 
-**AUFS filesystem support**
+**Optional AUFS filesystem support**
 
 
 Ubuntu Raring already comes with the 3.8 kernel, so we don't need to install it. However, not all systems
 Ubuntu Raring already comes with the 3.8 kernel, so we don't need to install it. However, not all systems
-have AUFS filesystem support enabled, so we need to install it.
+have AUFS filesystem support enabled. AUFS support is optional as of version 0.7, but it's still available as
+a driver and we recommend using it if you can.
+
+To make sure aufs is installed, run the following commands:
 
 
 .. code-block:: bash
 .. code-block:: bash