From bba5fd455567f831270ff60bd6991481d5340958 Mon Sep 17 00:00:00 2001 From: Andy Rothfusz Date: Fri, 18 Oct 2013 18:00:44 -0700 Subject: [PATCH] Fix #2302 --- docs/sources/api/docker_remote_api_v1.6.rst | 9 ++++++--- docs/sources/use/basics.rst | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/sources/api/docker_remote_api_v1.6.rst b/docs/sources/api/docker_remote_api_v1.6.rst index 1734f81c07..4a743a75ac 100644 --- a/docs/sources/api/docker_remote_api_v1.6.rst +++ b/docs/sources/api/docker_remote_api_v1.6.rst @@ -13,9 +13,12 @@ Docker Remote API v1.6 1. Brief introduction ===================== -- The Remote API is replacing rcli -- Default port in the docker daemon is 4243 -- The API tends to be REST, but for some complex commands, like attach or pull, the HTTP connection is hijacked to transport stdout stdin and stderr +- The Remote API has replaced rcli +- The daemon listens on ``unix:///var/run/docker.sock``, but you can + :ref:`bind_docker`. +- The API tends to be REST, but for some complex commands, like + ``attach`` or ``pull``, the HTTP connection is hijacked to transport + ``stdout, stdin`` and ``stderr`` 2. Endpoints ============ diff --git a/docs/sources/use/basics.rst b/docs/sources/use/basics.rst index 8b4676f6ee..d66d5a8bd9 100644 --- a/docs/sources/use/basics.rst +++ b/docs/sources/use/basics.rst @@ -67,6 +67,8 @@ you don't need to add ``sudo`` to all the client commands. # Restart the docker daemon sudo service docker restart +.. _bind_docker: + Bind Docker to another host/port or a Unix socket -------------------------------------------------