Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve Dockermod incompatibility with docker-py 6.0.0 #62882

Merged
merged 3 commits into from
Oct 13, 2022
Merged

Resolve Dockermod incompatibility with docker-py 6.0.0 #62882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bbf8d6
Resolve docker 6.0.0 version issue
rittycat Oct 13, 2022
f82af2b
Merge branch 'master' into dockermod-incompatibility-docker-py-6.0.0
rittycat Oct 13, 2022
1d5155f
Create 62882.fixed
rittycat Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/62882.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed dockermod version_info function for docker-py 6.0.0+
7 changes: 6 additions & 1 deletion salt/modules/dockermod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down