0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from vvoland/c8d-push-hide-jsons

Browse source 
c8d/push: Show progress only on blobs
This commit is contained in:
Paweł Gronowski 2023-10-16 13:39:25 +02:00 • committed by GitHub
commit 6040283f23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions

18
daemon/containerd/image_push.go
View file

@ -129,24 +129,22 @@ func (i *ImageService) pushRef(ctx context.Context, targetRef reference.Named, m
return err
}
addChildrenToJobs := containerdimages.HandlerFunc(
addLayerJobs := containerdimages.HandlerFunc(
func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
children, err := containerdimages.Children(ctx, store, desc)
if err != nil {
return nil, err
switch {
case containerdimages.IsIndexType(desc.MediaType),
containerdimages.IsManifestType(desc.MediaType),
containerdimages.IsConfigType(desc.MediaType):
default:
jobsQueue.Add(desc)
}
for _, c := range children {
jobsQueue.Add(c)
}
jobsQueue.Add(desc)
return nil, nil
},
)
handlerWrapper := func(h images.Handler) images.Handler {
return containerdimages.Handlers(addChildrenToJobs, h)
return containerdimages.Handlers(addLayerJobs, h)
}
err = remotes.PushContent(ctx, pusher, target, store, limiter, platforms.All, handlerWrapper)