From 433e00c219a993de31099237fca4b08361bf14e4 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 10 Jun 2019 16:42:59 +0200 Subject: [PATCH] Clarify documentation on dockerfile. (#57570) --- lib/ansible/modules/cloud/docker/docker_image.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_image.py b/lib/ansible/modules/cloud/docker/docker_image.py index 08b2871fbd..4ff5b26dfa 100644 --- a/lib/ansible/modules/cloud/docker/docker_image.py +++ b/lib/ansible/modules/cloud/docker/docker_image.py @@ -59,7 +59,8 @@ options: type: list dockerfile: description: - - Use with state C(present) to provide an alternate name for the Dockerfile to use when building an image. + - Use with state C(present) and source C(build) to provide an alternate name for the Dockerfile to use when building an image. + - This can also include a relative path (relative to I(path)). type: str http_timeout: description: @@ -142,7 +143,8 @@ options: version_added: "2.2" dockerfile: description: - - Use with state C(present) to provide an alternate name for the Dockerfile to use when building an image. + - Use with state C(present) and source C(build) to provide an alternate name for the Dockerfile to use when building an image. + - This can also include a relative path (relative to I(path)). - Please use I(build.dockerfile) instead. This option will be removed in Ansible 2.12. type: str version_added: "2.0"