Fix extraction of container Image when using podman #8333
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
simonrw
approved these changes
May 18, 2023
Comment on lines
722
to
729
| def container_init(self, attrs=None, *args, **kwargs): | ||
| # Simulate podman API response, Docker returns "sha:..." for Image, podman returns "<image-name>:<tag>". | ||
| # See https://github.com/containers/podman/issues/8329 | ||
| attrs["Image"] = image_name | ||
| container_init_orig(self, attrs=attrs, *args, **kwargs) | ||
|
|
||
| # apply patch to simulate podman behavior | ||
| container_init_orig = Container.__init__ |
There was a problem hiding this comment.
This is probably my issue, but I find it really confusing to have a variable used (container_init_orig) before it has been defined. I know Python's scoping rules allow this, but still it's weird. Not that you need to change it, just raising for discussion.
... Or you could move the function definition to in between lines 728 and 729?
There was a problem hiding this comment.
Good point, I've gotten so used to Python's scoping that I don't notice the difference anymore (although you already pointed it out to me several times!). 😄 But makes sense, updated it! 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix extraction of container Image when using podman. We have some customers who are using podman (with Docker not being available), and one of the issues that has surfaced is that the
list_containers(..)Docker SDK call fails when using podman.The root cause is that certain versions of podman use a slightly different API response format for listing containers: containers/podman#8329 . In particular, the
Imageattribute of containers is"sha256:..."for Docker, but it contains the actual image name/tag like"myimage:mytag-123"for podman.A simple integration test is added which simulates the podman API response via a monkey patch. Without the fix in the PR, this test would fail, and the patch in
docker_sdk_client.pymakes the test pass (and should fix the customer issue, too).We can consider contributing this fix to the upstream repo, too - but for now the goal is to get a fix out quickly to our users.
The PR also removes a few unused strings in
constants.py. 🧹