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.

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

Resolve Dockermod incompatibility with docker-py 6.0.0 #62882

Conversation

rittycat
Copy link
Contributor

@rittycat rittycat commented Oct 13, 2022

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:

Previous 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 ints

Merge 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.

@welcome
Copy link

welcome bot commented Oct 13, 2022

Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as possible. In the meantime, here’s some information that may help as you continue your Salt journey.
Please be sure to review our Code of Conduct. Also, check out some of our community resources including:

There are lots of ways to get involved in our community. Every month, there are around a dozen opportunities to meet with other contributors and the Salt Core team and collaborate in real time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
If you have additional questions, email us at saltproject@vmware.com. We’re glad you’ve joined our community and look forward to doing awesome things with you!

@rittycat rittycat marked this pull request as ready for review October 13, 2022 13:45
@rittycat rittycat requested a review from a team as a code owner October 13, 2022 13:45
@rittycat rittycat requested review from MKLeb and removed request for a team October 13, 2022 13:45
@garethgreenaway garethgreenaway merged commit 427718c into saltstack:master Oct 13, 2022
@welcome
Copy link

welcome bot commented Oct 13, 2022

Congratulations on your first PR being merged! 🎉

@chateaulav
Copy link

does not resolve overall dockermod issue, as seen here: #62602

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants