瀏覽代碼

c8d: Fix pull progress update

We were sending the "Pulling from ..." message too early, if the pull
progress wasn't able to resolve the image we wouldn't sent the error
back. Sending that first message would have flushed the output stream
and image_routes.go would return a nil error.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
Djordje Lukic 1 年之前
父節點
當前提交
32e2c53467
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      daemon/containerd/image_pull.go

+ 6 - 2
daemon/containerd/image_pull.go

@@ -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