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

Merge pull request #46494 from rumpl/c8d-fix-daemon-proxy

Browse source
This commit is contained in:
Djordje Lukic 2023-09-18 14:43:05 +02:00 • committed by GitHub
commit 24405e8044
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/containerd/image_pull.go
View file

@ -73,8 +73,14 @@ func (i *ImageService) PullImage(ctx context.Context, image, tagOrDigest string,
finishProgress := jobs.showProgress(ctx, out, pp)
defer finishProgress()
var sentPullingFrom bool
ah := images.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
if images.IsManifestType(desc.MediaType) {
if !sentPullingFrom {
progress.Message(out, tagOrDigest, "Pulling from "+reference.Path(ref))
sentPullingFrom = true
}
available, _, _, missing, err := images.Check(ctx, i.client.ContentStore(), desc, p)
if err != nil {
return nil, err
@ -98,8 +104,6 @@ func (i *ImageService) PullImage(ctx context.Context, image, tagOrDigest string,
infoHandler := snapshotters.AppendInfoHandlerWrapper(ref.String())
opts = append(opts, containerd.WithImageHandlerWrapper(infoHandler))
progress.Message(out, tagOrDigest, "Pulling from "+reference.Path(ref))
img, err := i.client.Pull(ctx, ref.String(), opts...)
if err != nil {
return err