saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve docker 6.0.0 version issue

Browse source
This commit is contained in:
rittycat 2022-10-13 23:43:42 +11:00 • committed by GitHub
parent 9d7307332f
commit 1bbf8d6b18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/modules/dockermod.py
View file

@ -344,7 +344,12 @@ def _get_docker_py_versioninfo():
try:
return docker.version_info
except AttributeError:
pass
# docker 6.0.0+ exposes version from __version__ attribute
try:
docker_version = docker.__version__.split(".")
return tuple(int(n) for n in docker_version)
except AttributeError:
pass
def _get_client(timeout=NOTSET, **kwargs):