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

vendored Docker SDK for Python code: update to latest version #619

Merged
merged 5 commits into from
May 20, 2023

Conversation

felixfontein
Copy link
Collaborator

@felixfontein felixfontein commented May 10, 2023

SUMMARY

All bugfixes in docker/docker-py@aca129d...bc4c0d7 that we don't already have. (There is no feature in that range that affects the vendored code.)

Ref: #435.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

vendored Docker SDK for Python code

felixfontein and others added 4 commits May 10, 2023 22:12
Need to return data, not size. By returning an empty
string, EOF will be detected properly since `len()`
will be `0`.

Fixes docker/docker-py#3098.

Cherry-picked from docker/docker-py@f846232

Co-authored-by: Milas Bowman <[email protected]>
…er-py#2865)

Fixes docker/docker-py#2278, which was originally addressed in docker/docker-py#2279, but was not
properly merged. Additionally it did not address the problem
of poll not existing on Windows. This patch falls back on the
more limited select method if host system is Windows.

Cherry-picked from docker/docker-py@a02ba74

Co-authored-by: Tyler Westland <[email protected]>
…3125)

Only listen to read events when polling a socket in order
to avoid incorrectly trying to read from a socket that is
not actually ready.

Cherry-picked from docker/docker-py@c5e582c

Co-authored-by: Loïc Leyendecker <[email protected]>
Copy link

@mariolenz mariolenz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to approve because I don't know this collection. So I'm not really sure what those changes really mean.

But it looks like they're the same as docker/docker-py#2865, docker/docker-py#3099 and docker/docker-py#3112. If they're fine for the official Docker SDK for Python, I guess they're OK for this collection, too.

@felixfontein felixfontein merged commit 1660bf4 into ansible-collections:main May 20, 2023
@felixfontein felixfontein deleted the docker-py-2 branch May 20, 2023 17:36
@felixfontein
Copy link
Collaborator Author

@mariolenz thanks a lot for checking the commits!

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.

2 participants