From db8f13c7026311769afa6920cf54c81af90bdb39 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 10 Dec 2018 14:40:29 +0100 Subject: [PATCH] docker_*: hint at DOCKER_CONFIG environment variable (#49689) * Hint at DOCKER_CONFIG environment variable directly supported by docker-py. * Adjust wording. (cherry picked from commit 270b6a2ee29dbf4906edda9e4806e23d098140a2) --- lib/ansible/utils/module_docs_fragments/docker.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ansible/utils/module_docs_fragments/docker.py b/lib/ansible/utils/module_docs_fragments/docker.py index 2fbd220ad96..7ecc21c7fb4 100644 --- a/lib/ansible/utils/module_docs_fragments/docker.py +++ b/lib/ansible/utils/module_docs_fragments/docker.py @@ -107,4 +107,7 @@ notes: U(https://docker-py.readthedocs.io/en/stable/machine/) for more details. - When connecting to Docker daemon with TLS, you might need to install additional Python packages. For the Docker SDK for Python, version 2.4 or newer, this can be done by installing C(docker[tls]) with M(pip). + - Note that the Docker SDK for Python only allows to specify the path to the Docker configuration for very few functions. + In general, it will use C($HOME/docker/config.json) if the C(DOCKER_CONFIG) environment variable is not specified, + and use C($DOCKER_CONFIG/config.json) otherwise. '''