From dacb5075dffddd89aedddac268c8e5189aaab207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 17 Aug 2022 16:50:13 +0200 Subject: [PATCH] c8d/pull: Don't unpack manually MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We pass WithPullUnpack anyway Signed-off-by: Paweł Gronowski --- daemon/containerd/image_pull.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/daemon/containerd/image_pull.go b/daemon/containerd/image_pull.go index dcb9861383832..f78da440c8c3b 100644 --- a/daemon/containerd/image_pull.go +++ b/daemon/containerd/image_pull.go @@ -61,21 +61,7 @@ func (i *ImageService) PullImage(ctx context.Context, image, tagOrDigest string, finishProgress := showProgress(ctx, jobs, outStream, pullProgress(i.client.ContentStore())) defer finishProgress() - img, err := i.client.Pull(ctx, ref.String(), opts...) - if err != nil { - return err - } - - unpacked, err := img.IsUnpacked(ctx, i.snapshotter) - if err != nil { - return err - } - - if !unpacked { - if err := img.Unpack(ctx, i.snapshotter); err != nil { - return err - } - } + _, err = i.client.Pull(ctx, ref.String(), opts...) return err }