Resolve Dockermod incompatibility with docker-py 6.0.0 #62882
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Resolve inability for dockermod to fetch the version on docker-py 6.0.0+
What issues does this PR fix or reference?
Fixes:
docker.__version__
string instead ofdocker.version_info
tuple https://github.com/docker/docker-py/releases/tag/6.0.0Previous Behavior
Attempted to retrieve version info from
docker.version_info
New Behavior
The same, but on failure will attempt to retrieve version info from
docker.__version__
and convert it to a tuple of intsMerge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.