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

docker-py: bump minimal version to 1.8.0 (#46134)

Browse source 
* Bumping docker-py minimal version to 1.8.0.
* Improve docs formatting.
This commit is contained in:
Felix Fontein 2018-09-26 08:28:32 +02:00 committed by Abhijeet Kasurde
parent c98cec17e0
commit 95cfcac694
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/docker_common.py
View file

@ -79,7 +79,7 @@ DEFAULT_DOCKER_HOST = 'unix://var/run/docker.sock'
DEFAULT_TLS = False
DEFAULT_TLS_VERIFY = False
DEFAULT_TLS_HOSTNAME = 'localhost'
MIN_DOCKER_VERSION = "1.7.0"
MIN_DOCKER_VERSION = "1.8.0"
DEFAULT_TIMEOUT_SECONDS = 60
DOCKER_COMMON_ARGS = dict(

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

@ -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).

4
lib/ansible/modules/cloud/docker/docker_image.py
View file

@ -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).

2
lib/ansible/modules/cloud/docker/docker_image_facts.py
View file

@ -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).

2
lib/ansible/modules/cloud/docker/docker_login.py
View file

@ -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).

2
lib/ansible/modules/cloud/docker/docker_network.py
View file

@ -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).

10
lib/ansible/utils/module_docs_fragments/docker.py
View file

@ -24,8 +24,8 @@ options:
docker_host:
description:
- "The URL or Unix socket path used to connect to the Docker API. To connect to a remote host, provide the
TCP connection string. For example, 'tcp://192.0.2.23:2376'. If TLS is used to encrypt the connection,
the module will automatically replace 'tcp' in the connection URL with 'https'."
TCP connection string. For example, C(tcp://192.0.2.23:2376). If TLS is used to encrypt the connection,
the module will automatically replace C(tcp) in the connection URL with C(https)."
- If the value is not specified in the task, the value of environment variable C(DOCKER_HOST) will be used
instead. If the environment variable is not set, the default value will be used.
default: "unix://var/run/docker.sock"
@ -101,8 +101,8 @@ options:
notes:
- Connect to the Docker daemon by providing parameters with each task or by defining environment variables.
You can define DOCKER_HOST, DOCKER_TLS_HOSTNAME, DOCKER_API_VERSION, DOCKER_CERT_PATH, DOCKER_SSL_VERSION,
DOCKER_TLS, DOCKER_TLS_VERIFY and DOCKER_TIMEOUT. If you are using docker machine, run the script shipped
You can define C(DOCKER_HOST), C(DOCKER_TLS_HOSTNAME), C(DOCKER_API_VERSION), C(DOCKER_CERT_PATH), C(DOCKER_SSL_VERSION),
C(DOCKER_TLS), C(DOCKER_TLS_VERIFY) and C(DOCKER_TIMEOUT). If you are using docker machine, run the script shipped
with the product that sets up the environment. It will set these variables for you. See
https://docker-py.readthedocs.io/en/stable/machine/ for more details.
U(https://docker-py.readthedocs.io/en/stable/machine/) for more details.
'''