ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

docker_* tests: check API version (#48620)

Browse source 
* Check minimal API and docker-py versions for all docker_* tests.

* Improve docker_swarm creation/destruction for tests.

* Fail when conditions aren't met.

* Don't hardcode address for advertise_addr.
This commit is contained in:
Felix Fontein 2018-11-19 11:01:40 +01:00 • committed by John R Barker
commit 3bb41ccb8e
20 changed files with 537 additions and 481 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -220,7 +220,7 @@ def main():
# Version checks
cache_min_version = '3.3.0'
if client.module.params['builder_cache'] and LooseVersion(docker_version) < LooseVersion(cache_min_version):
if client.module.params['builder_cache'] and client.docker_py_version < LooseVersion(cache_min_version):
msg = "Error: docker version is %s. Minimum version required for builds option is %s. Use `pip install --upgrade docker` to upgrade."
client.module.fail(msg=(msg % (docker_version, cache_min_version)))