diff --git a/docs/sources/index.rst b/docs/sources/index.rst index 1fb82f3bec..c10ed2abf9 100644 --- a/docs/sources/index.rst +++ b/docs/sources/index.rst @@ -12,8 +12,7 @@ dependencies. ``docker`` runs three ways: -* as a daemon to manage LXC containers on your :ref:`Linux host - ` (``sudo docker -d``) +* as a daemon to manage LXC containers on your host machine (``sudo docker -d``) * as a :ref:`CLI ` which talks to the daemon's `REST API `_ (``docker run ...``) * as a client of :ref:`Repositories ` diff --git a/docs/sources/installation/binaries.rst b/docs/sources/installation/binaries.rst index 4da511b92c..611429f84a 100644 --- a/docs/sources/installation/binaries.rst +++ b/docs/sources/installation/binaries.rst @@ -16,15 +16,29 @@ Before following these directions, you should really check if a packaged version of Docker is already available for your distribution. We have packages for many distributions, and more keep showing up all the time! -Check Your Kernel ------------------ -Your host's Linux kernel must meet the Docker :ref:`kernel` - -Check for User Space Tools +Check runtime dependencies -------------------------- -You must have a working installation of the `lxc `_ utilities and library. +To run properly, docker needs the following software to be installed at runtime: + +- GNU Tar version 1.26 or later +- iproute2 version 3.5 or later (build after 2012-05-21), and specifically the "ip" utility +- iptables version 1.4 or later +- The LXC utility scripts (http://lxc.sourceforge.net) version 0.8 or later +- Git version 1.7 or later +- XZ Utils 4.9 or later + + +Check kernel dependencies +------------------------- + +Docker in daemon mode has specific kernel requirements. For details, see +http://docs.docker.io/en/latest/articles/kernel/ + +Note that Docker also has a client mode, which can run on virtually any linux kernel (it even builds +on OSX!). + Get the docker binary: ----------------------