Quellcode durchsuchen

docs: reuse official dependencies list from packager's guide for custom binary install docs

Solomon Hykes vor 11 Jahren
Ursprung
Commit
45e8d1f4c0
2 geänderte Dateien mit 21 neuen und 8 gelöschten Zeilen
  1. 1 2
      docs/sources/index.rst
  2. 20 6
      docs/sources/installation/binaries.rst

+ 1 - 2
docs/sources/index.rst

@@ -12,8 +12,7 @@ dependencies.
 
 
 ``docker`` runs three ways:
 ``docker`` runs three ways:
 
 
-* as a daemon to manage LXC containers on your :ref:`Linux host
-  <kernel>` (``sudo docker -d``)
+* as a daemon to manage LXC containers on your host machine (``sudo docker -d``)
 * as a :ref:`CLI <cli>` which talks to the daemon's `REST API
 * as a :ref:`CLI <cli>` which talks to the daemon's `REST API
   <api/docker_remote_api>`_ (``docker run ...``)
   <api/docker_remote_api>`_ (``docker run ...``)
 * as a client of :ref:`Repositories <working_with_the_repository>`
 * as a client of :ref:`Repositories <working_with_the_repository>`

+ 20 - 6
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
 of Docker is already available for your distribution.  We have packages for many
 distributions, and more keep showing up all the time!
 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 <http://linuxcontainers.org>`_ 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:
 Get the docker binary:
 ----------------------
 ----------------------