cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update docker_container.py (#42370)

Browse source 
`docker-py` is no longer a thing.

https://github.com/docker/docker-py/issues/1431
This commit is contained in:
rcgoodfellow 2018-07-05 13:03:50 -05:00 committed by Sam Doran
parent 82b050e6b8
commit e3478e0da5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -96,7 +96,7 @@ options:
description: description:
- Path to a file containing environment variables I(FOO=BAR). - Path to a file containing environment variables I(FOO=BAR).
- If variable also present in C(env), then C(env) value will override. - 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: entrypoint:
description: description:
- Command that overwrites the default ENTRYPOINT of the image. - Command that overwrites the default ENTRYPOINT of the image.
@ -421,7 +421,7 @@ author:
requirements: requirements:
- "python >= 2.6" - "python >= 2.6"
- "docker-py >= 1.7.0" - "docker >= 1.7.0"
- "Docker API >= 1.20" - "Docker API >= 1.20"
''' '''
@ -617,7 +617,7 @@ try:
else: else:
from docker.utils.types import Ulimit, LogConfig from docker.utils.types import Ulimit, LogConfig
except: except:
# missing docker-py handled in ansible.module_utils.docker # missing docker handled in ansible.module_utils.docker
pass pass