InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50199 from vvoland/c8d-push-fixtag

Browse Source 
c8d/push: Fix fallback single-manifest push not creating a tag
This commit is contained in:
Paweł Gronowski
2025-06-13 13:42:50 +00:00
committed by GitHub
parent e921abf618 987b8a88a6
commit 9a9cade0df
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
daemon/containerd/image_push.go
View File

@@ -143,21 +143,6 @@ func (i *ImageService) pushRef(ctx context.Context, targetRef reference.Named, p
realStore := store
wrapped := wrapWithFakeMountableBlobs(store, mountableBlobs)
store = wrapped
// Annotate ref with digest to push only push tag for single digest
ref := targetRef
if _, digested := ref.(reference.Digested); !digested {
ref, err = reference.WithDigest(ref, target.Digest)
if err != nil {
return err
}
}
pusher, err := resolver.Pusher(ctx, ref.String())
if err != nil {
return err
}
addLayerJobs := c8dimages.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
if showBlobProgress(desc) {
jobsQueue.Add(desc)
@@ -170,7 +155,25 @@ func (i *ImageService) pushRef(ctx context.Context, targetRef reference.Named, p
return c8dimages.Handlers(addLayerJobs, h)
}
err = remotes.PushContent(ctx, pusher, target, store, limiter, platforms.All, handlerWrapper)
push := func(ctx context.Context, desc ocispec.Descriptor) error {
ref := targetRef
if _, digested := ref.(reference.Digested); !digested {
// Annotate ref with digest to push only push tag for single digest
ref, err = reference.WithDigest(ref, target.Digest)
if err != nil {
return err
}
}
pusher, err := resolver.Pusher(ctx, ref.String())
if err != nil {
return err
}
return remotes.PushContent(ctx, pusher, desc, store, limiter, platforms.All, handlerWrapper)
}
err = push(ctx, target)
if err != nil {
// If push failed because of a missing content, no specific platform was requested
// and the target is an index, select a platform-specific manifest to push instead.
@@ -186,7 +189,7 @@ func (i *ImageService) pushRef(ctx context.Context, targetRef reference.Named, p
orgTarget := target
target = newTarget
pp.TurnNotStartedIntoUnavailable()
err = remotes.PushContent(ctx, pusher, target, store, limiter, platforms.All, handlerWrapper)
err = push(ctx, target)
if err == nil {
progress.Aux(out, auxprogress.ManifestPushedInsteadOfIndex{