From a5f242e4a212696a8ea7ff28c3a21ecddd9d21cf Mon Sep 17 00:00:00 2001 From: chao liu Date: Sun, 1 Oct 2017 16:16:24 -0700 Subject: [PATCH] Add notes on docker version in quickstart and multinode guide In the quickstart guide, the min version of docker is 1.10.0, and the max version is none. But the `docker daemon` doesn't work since v1.13.0. Please refer to: https://docs.docker.com/engine/deprecated/#docker-daemon-subcommand "docker daemon subcommand Deprecated In Release: v1.13.0 Target For Removal In Release: v17.12 The daemon is moved to a separate binary (dockerd), and should be used instead." I think it's better to let the readers know it. Change-Id: I92882a3860704acdc31ff0c89e21ab2793e0b268 --- doc/source/user/multinode.rst | 6 ++++++ doc/source/user/quickstart.rst | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/source/user/multinode.rst b/doc/source/user/multinode.rst index 75c671fd72..5f0acda05a 100644 --- a/doc/source/user/multinode.rst +++ b/doc/source/user/multinode.rst @@ -112,6 +112,12 @@ section: ExecStart= ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS +.. note:: + + If your docker version is >=1.13.0, the ``docker daemon`` should be replaced + with ``dockerd``. + + Restart Docker by executing the following commands: :: diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index 82199a3e8f..1671b5e1bc 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -441,9 +441,11 @@ to include the MTU size to be used for Docker containers. .. note:: - Depend of your Docker version and distro, ExecStart command may be different which may cause - Docker start failures. The default ExecStart command for your system can be obtained from - ``/usr/lib/systemd/system/docker.service``. + Depend of your Docker version and distro, ExecStart command may be + different which may cause Docker start failures. If your docker version + is >= 1.13.0, the ``docker daemon`` is moved to ``dockerd``, and should + be used instead. The default ExecStart command for your system can be + obtained from ``/usr/lib/systemd/system/docker.service``. .. note::