From fbfbcfaf5541a170eb461c98c3a4057d915ef96c Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Mon, 13 Nov 2017 10:20:40 -0800 Subject: [PATCH] Better docs for docker.endpoint option Fixes https://github.com/hashicorp/nomad/issues/3533 --- website/source/docs/drivers/docker.html.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/website/source/docs/drivers/docker.html.md b/website/source/docs/drivers/docker.html.md index 62a1528e5..7eb98af3f 100644 --- a/website/source/docs/drivers/docker.html.md +++ b/website/source/docs/drivers/docker.html.md @@ -490,9 +490,12 @@ of the Linux Kernel and Docker daemon. The `docker` driver has the following [client configuration options](/docs/agent/configuration/client.html#options): -* `docker.endpoint` - Defaults to `unix:///var/run/docker.sock`. You will need - to customize this if you use a non-standard socket (HTTP or another - location). +* `docker.endpoint` - If using a non-standard socket, HTTP or another location, + or if TLS is being used, `docker.endpoint` must be set. If unset, Nomad will + attempt to instantiate a Docker client using the `DOCKER_HOST` environment + variable and then fall back to the default listen address for the given + operating system. Defaults to `unix:///var/run/docker.sock` on unix platforms + and `npipe:////./pipe/docker_engine` for Windows. * `docker.auth.config` - Allows an operator to specify a JSON file which is in the dockercfg format containing authentication