From e3478e0da5dd99855f3584f75ecb5237a96ae937 Mon Sep 17 00:00:00 2001 From: rcgoodfellow Date: Thu, 5 Jul 2018 13:03:50 -0500 Subject: [PATCH] Update docker_container.py (#42370) `docker-py` is no longer a thing. https://github.com/docker/docker-py/issues/1431 --- lib/ansible/modules/cloud/docker/docker_container.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py index 4fba1be1ba5..d358af1d08c 100644 --- a/lib/ansible/modules/cloud/docker/docker_container.py +++ b/lib/ansible/modules/cloud/docker/docker_container.py @@ -96,7 +96,7 @@ options: description: - Path to a file containing environment variables I(FOO=BAR). - If variable also present in C(env), then C(env) value will override. - - Requires docker-py >= 1.4.0. + - Requires docker >= 1.4.0. entrypoint: description: - Command that overwrites the default ENTRYPOINT of the image. @@ -421,7 +421,7 @@ author: requirements: - "python >= 2.6" - - "docker-py >= 1.7.0" + - "docker >= 1.7.0" - "Docker API >= 1.20" ''' @@ -617,7 +617,7 @@ try: else: from docker.utils.types import Ulimit, LogConfig except: - # missing docker-py handled in ansible.module_utils.docker + # missing docker handled in ansible.module_utils.docker pass