[WIP] add platform selection to image inspect#47114
Draft
thaJeztah wants to merge 2 commits intomoby:masterfrom
Draft
[WIP] add platform selection to image inspect#47114thaJeztah wants to merge 2 commits intomoby:masterfrom
thaJeztah wants to merge 2 commits intomoby:masterfrom
Conversation
c60f6e5 to
e236526
Compare
thaJeztah
commented
Jan 19, 2024
daemon/containerd/image.go
Outdated
Comment on lines
43
to
44
| log.G(ctx).WithField("platform", cplatforms.Format(*options.Platform)).Debug("filtering by platform") | ||
| platform = cplatforms.OnlyStrict(*options.Platform) |
Member
Author
There was a problem hiding this comment.
It looks like we're only using the matcher for sorting the results, not filtering / matching?
thaJeztah
commented
Jan 19, 2024
Comment on lines
+71
to
+75
|
|
||
| if options.Platform != nil && !platform.Match(ociimage.Platform) { | ||
| log.G(ctx).WithField("platform", cplatforms.Format(ociimage.Platform)).Info("no match") | ||
| return nil | ||
| } | ||
|
|
Member
Author
There was a problem hiding this comment.
So I added this, but not sure if that's correct (or if the current behavior was intentional for some reason 🤔)
Contributor
There was a problem hiding this comment.
Yep, its correct.
Lack of Match was an oversight that didn't really had any visible effect because without overriding the platform, the default was to pick the default host platform, or "whatever comes first" if its no present (AllPlatformsWithPreference).
Contributor
There was a problem hiding this comment.
The sorting is still needed though, specifically for matchers (like AllPlatformsWithPreference) which have some preferences about the platform that should be chosen.
Member
Author
There was a problem hiding this comment.
Yup; sorting looked ok indeed.
Thanks for looking! I'll split these changes to a separate branch and PR 👍
Member
Author
|
One failure looks related; |
e25f53d to
41577ba
Compare
If an image has multiple platforms in the local image store, we default to
the host's default platform when inspecting the image.
With this patch applied, the inspect endpoint now allows a platform
query-parameter to be passed to select the variant to inspect;
hack/make.sh binary && make install
TEST_INTEGRATION_USE_SNAPSHOTTER=1 dockerd --debug --storage-driver=overlayfs
docker pull --platform=linux/arm64 alpine
docker pull --platform=linux/amd64 alpine
curl -s --unix-socket /var/run/docker.sock 'http://localhost/v1.44/images/alpine:latest/json?platform=linux/arm64' | jq .Architecture
"arm64"
curl -s --unix-socket /var/run/docker.sock 'http://localhost/v1.44/images/alpine:latest/json?platform=linux/amd64' | jq .Architecture
"amd64"
Still to fix: when passing a platform for which no images are present, all images
are found, and it returns the first image (or the old default: "linux/amd64");
curl -s --unix-socket /var/run/docker.sock 'http://localhost/v1.44/images/alpine:latest/json?platform=windows/s390x' | jq .Architecture
"amd64"
Daemon logs:
INFO[2024-01-19T09:51:13.692119375Z] API listen on /var/run/docker.sock
DEBU[2024-01-19T09:51:15.421193584Z] Calling GET /v1.44/images/alpine:latest/json?platform=windows/s390x
INFO[2024-01-19T09:51:15.422053417Z] filtering by platform platform=windows/s390x
INFO[2024-01-19T09:51:15.429996542Z] found images images=2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Before this patch, when passing a platform for which no images are present,
all images are found, and it returns the first image (or the old default:
"linux/amd64");
curl -s --unix-socket /var/run/docker.sock 'http://localhost/v1.44/images/alpine:latest/json?platform=windows/s390x' | jq .Architecture
"amd64"
With this patch, an error is returned:
curl -s --unix-socket /var/run/docker.sock 'http://localhost/v1.44/images/alpine:latest/json?platform=windows/s390x'
{"message":"No such image: alpine:latest for platform: windows/s390x"}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
41577ba to
252e881
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
If an image has multiple platforms in the local image store, we default to the host's default platform when inspecting the image.
With this patch applied, the inspect endpoint now allows a platform query-parameter to be passed to select the variant to inspect;
Still to fix: when passing a platform for which no images are present, all images
are found, and it returns the first image (or the old default: "linux/amd64");
Daemon logs:
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)