dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-06-30 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

c8d/pull: Apply host platform variant to pulls

Browse Source 
Always pass the pull platform through WithPlatform.

For implicit pulls this is the host platform, including the amd64
variant; for explicit pulls it remains the requested platform.

This doesn't make the platform matching strict - containerd resolves
WithPlatform through platforms.Only, so linux/amd64/v3 still falls back
to compatible lower or plain linux/amd64 manifests when no v3 manifest
exists.

This keeps initial pull selection consistent with store-side matching
and preserves compatibility with non-variant amd64 images.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2026-06-17 22:07:38 +02:00
parent 944e805706
commit d98515d91d
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/containerd/image_pull.go
View File

@@ -104,10 +104,11 @@ func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platfor
ctx = remotes.WithMediaTypeKeyPrefix(ctx, policyimage.ArtifactTypeCosignSignature, "cosign-signature")
ctx = remotes.WithMediaTypeKeyPrefix(ctx, policyimage.ArtifactTypeSigstoreBundle, "sigstore-bundle")
var opts []containerd.RemoteOpt
pullPlatform := i.hostPlatformSpec()
if platform != nil {
opts = append(opts, containerd.WithPlatform(platforms.FormatAll(*platform)))
pullPlatform = *platform
}
opts := []containerd.RemoteOpt{containerd.WithPlatform(platforms.FormatAll(pullPlatform))}
resolver, _ := i.newResolverFromAuthConfig(ctx, authConfig, ref, metaHeaders)
opts = append(opts, containerd.WithResolver(resolver))
@@ -138,10 +139,7 @@ func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platfor
}()
}
p := i.hostPlatformMatcher()
if platform != nil {
p = platforms.Only(*platform)
}
p := platforms.Only(pullPlatform)
pullJobs := newJobs()
opts = append(opts, containerd.WithImageHandler(c8dimages.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
@@ -252,10 +250,7 @@ func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platfor
// the same message as the graphdrivers backend.
// The one returned by containerd doesn't contain the platform and is much less informative.
if strings.Contains(err.Error(), "platform") {
platformStr := platforms.FormatAll(i.hostPlatformSpec())
if platform != nil {
platformStr = platforms.FormatAll(*platform)
}
platformStr := platforms.FormatAll(pullPlatform)
return errdefs.NotFound(fmt.Errorf("no matching manifest for %s in the manifest list entries: %w", platformStr, err))
}
}