summaryrefslogtreecommitdiff
path: root/lib/ansible/modules/cloud
diff options
context:
space:
mode:
authorFelix Fontein <felix@fontein.de>2018-09-26 08:28:32 +0200
committerAbhijeet Kasurde <akasurde@redhat.com>2018-09-26 11:58:32 +0530
commit95cfcac6941bdbae1b8aadd4da766cedfc2c41bd (patch)
treef26ad0ef7f7ce3ae96d95d325db255a595891247 /lib/ansible/modules/cloud
parentc98cec17e0dc4e34a0657f05d97b2b179bc4b64e (diff)
downloadansible-95cfcac6941bdbae1b8aadd4da766cedfc2c41bd.tar.gz
docker-py: bump minimal version to 1.8.0 (#46134)
* Bumping docker-py minimal version to 1.8.0. * Improve docs formatting.
Diffstat (limited to 'lib/ansible/modules/cloud')
-rw-r--r--lib/ansible/modules/cloud/docker/docker_container.py2
-rw-r--r--lib/ansible/modules/cloud/docker/docker_image.py4
-rw-r--r--lib/ansible/modules/cloud/docker/docker_image_facts.py2
-rw-r--r--lib/ansible/modules/cloud/docker/docker_login.py2
-rw-r--r--lib/ansible/modules/cloud/docker/docker_network.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py
index 1a50e138ff..8ec813aee7 100644
--- a/lib/ansible/modules/cloud/docker/docker_container.py
+++ b/lib/ansible/modules/cloud/docker/docker_container.py
@@ -429,7 +429,7 @@ author:
requirements:
- "python >= 2.6"
- - "docker-py >= 1.7.0"
+ - "docker-py >= 1.8.0"
- "Please note that the L(docker-py,https://pypi.org/project/docker-py/) Python
module has been superseded by L(docker,https://pypi.org/project/docker/)
(see L(here,https://github.com/docker/docker-py/issues/1310) for details).
diff --git a/lib/ansible/modules/cloud/docker/docker_image.py b/lib/ansible/modules/cloud/docker/docker_image.py
index 886326c909..fa21c439c5 100644
--- a/lib/ansible/modules/cloud/docker/docker_image.py
+++ b/lib/ansible/modules/cloud/docker/docker_image.py
@@ -128,7 +128,7 @@ options:
description:
- Provide a dictionary of C(key:value) build arguments that map to Dockerfile ARG directive.
- Docker expects the value to be a string. For convenience any non-string values will be converted to strings.
- - Requires Docker API >= 1.21 and docker-py >= 1.7.0.
+ - Requires Docker API >= 1.21.
required: false
version_added: "2.2"
container_limits:
@@ -167,7 +167,7 @@ extends_documentation_fragment:
requirements:
- "python >= 2.6"
- - "docker-py >= 1.7.0"
+ - "docker-py >= 1.8.0"
- "Please note that the L(docker-py,https://pypi.org/project/docker-py/) Python
module has been superseded by L(docker,https://pypi.org/project/docker/)
(see L(here,https://github.com/docker/docker-py/issues/1310) for details).
diff --git a/lib/ansible/modules/cloud/docker/docker_image_facts.py b/lib/ansible/modules/cloud/docker/docker_image_facts.py
index 37319b81d4..8f90db1311 100644
--- a/lib/ansible/modules/cloud/docker/docker_image_facts.py
+++ b/lib/ansible/modules/cloud/docker/docker_image_facts.py
@@ -35,7 +35,7 @@ extends_documentation_fragment:
requirements:
- "python >= 2.6"
- - "docker-py >= 1.7.0"
+ - "docker-py >= 1.8.0"
- "Please note that the L(docker-py,https://pypi.org/project/docker-py/) Python
module has been superseded by L(docker,https://pypi.org/project/docker/)
(see L(here,https://github.com/docker/docker-py/issues/1310) for details).
diff --git a/lib/ansible/modules/cloud/docker/docker_login.py b/lib/ansible/modules/cloud/docker/docker_login.py
index 8fe95ffa4e..b668b5adbf 100644
--- a/lib/ansible/modules/cloud/docker/docker_login.py
+++ b/lib/ansible/modules/cloud/docker/docker_login.py
@@ -75,7 +75,7 @@ extends_documentation_fragment:
- docker
requirements:
- "python >= 2.6"
- - "docker-py >= 1.7.0"
+ - "docker-py >= 1.8.0"
- "Please note that the L(docker-py,https://pypi.org/project/docker-py/) Python
module has been superseded by L(docker,https://pypi.org/project/docker/)
(see L(here,https://github.com/docker/docker-py/issues/1310) for details).
diff --git a/lib/ansible/modules/cloud/docker/docker_network.py b/lib/ansible/modules/cloud/docker/docker_network.py
index 966ed7a300..c3ace43fa7 100644
--- a/lib/ansible/modules/cloud/docker/docker_network.py
+++ b/lib/ansible/modules/cloud/docker/docker_network.py
@@ -95,7 +95,7 @@ author:
requirements:
- "python >= 2.6"
- - "docker-py >= 1.7.0"
+ - "docker-py >= 1.8.0"
- "Please note that the L(docker-py,https://pypi.org/project/docker-py/) Python
module has been superseded by L(docker,https://pypi.org/project/docker/)
(see L(here,https://github.com/docker/docker-py/issues/1310) for details).