Browse code

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

Solomon Hykes authored on 2013/11/26 11:45:32
Showing 2 changed files
... ...
@@ -11,10 +11,10 @@ In short, Docker has the following kernel requirements:
11 11
 
12 12
 - Linux version 3.8 or above.
13 13
 
14
-- `AUFS support <http://aufs.sourceforge.net/>`_.
15
-
16 14
 - Cgroups and namespaces must be enabled.
17 15
 
16
+*Note: as of 0.7 docker no longer requires aufs. AUFS support is still available as an optional driver.*
17
+
18 18
 The officially supported kernel is the one recommended by the
19 19
 :ref:`ubuntu_linux` installation path. It is the one that most developers
20 20
 will use, and the one that receives the most attention from the core
... ...
@@ -58,17 +58,6 @@ detects something older than 3.8.
58 58
 See issue `#407 <https://github.com/dotcloud/docker/issues/407>`_ for details.
59 59
 
60 60
 
61
-AUFS support
62
-
63
-Docker currently relies on AUFS, an unioning filesystem.
64
-While AUFS is included in the kernels built by the Debian and Ubuntu
65
-distributions, is not part of the standard kernel. This means that if
66
-you decide to roll your own kernel, you will have to patch your
67
-kernel tree to add AUFS. The process is documented on
68
-`AUFS webpage <http://aufs.sourceforge.net/>`_.
69
-
70
-
71 61
 Cgroups and namespaces
72 62
 ----------------------
73 63
 
... ...
@@ -14,16 +14,11 @@ Ubuntu Linux
14 14
 
15 15
 .. include:: install_header.inc
16 16
 
17
-Right now, the officially supported distribution are:
17
+Docker is supported on the following versions of Ubuntu:
18 18
 
19 19
 - :ref:`ubuntu_precise`
20 20
 - :ref:`ubuntu_raring`
21 21
 
22
-Docker has the following dependencies
23
-
24
-* Linux kernel 3.8 (read more about :ref:`kernel`)
25
-* AUFS file system support (we are working on BTRFS support as an alternative)
26
-
27 22
 Please read :ref:`ufw`, if you plan to use `UFW (Uncomplicated
28 23
 Firewall) <https://help.ubuntu.com/community/UFW>`_
29 24
 
... ...
@@ -107,10 +102,13 @@ Ubuntu Raring 13.04 (64 bit)
107 107
 Dependencies
108 108
 ------------
109 109
 
110
-**AUFS filesystem support**
110
+**Optional AUFS filesystem support**
111 111
 
112 112
 Ubuntu Raring already comes with the 3.8 kernel, so we don't need to install it. However, not all systems
113
-have AUFS filesystem support enabled, so we need to install it.
113
+have AUFS filesystem support enabled. AUFS support is optional as of version 0.7, but it's still available as
114
+a driver and we recommend using it if you can.
115
+
116
+To make sure aufs is installed, run the following commands:
114 117
 
115 118
 .. code-block:: bash
116 119