From f0b3d5a2c5f2e867cbdfe26ff7c8690707135eeb Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcgstyle.net>
Date: Mon, 7 May 2018 11:17:30 -0700
Subject: [PATCH] Move image creation after unpack

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
---
 client.go | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/client.go b/client.go
index 6163a611b..cebdf89d6 100644
--- a/client.go
+++ b/client.go
@@ -338,20 +338,29 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
 		}
 	}
 
-	imgrec := images.Image{
-		Name:   name,
-		Target: desc,
-		Labels: pullCtx.Labels,
+	img := &image{
+		client: c,
+		i: images.Image{
+			Name:   name,
+			Target: desc,
+			Labels: pullCtx.Labels,
+		},
+	}
+
+	if pullCtx.Unpack {
+		if err := img.Unpack(ctx, pullCtx.Snapshotter); err != nil {
+			errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
+		}
 	}
 
 	is := c.ImageService()
 	for {
-		if created, err := is.Create(ctx, imgrec); err != nil {
+		if created, err := is.Create(ctx, img.i); err != nil {
 			if !errdefs.IsAlreadyExists(err) {
 				return nil, err
 			}
 
-			updated, err := is.Update(ctx, imgrec)
+			updated, err := is.Update(ctx, img.i)
 			if err != nil {
 				// if image was removed, try create again
 				if errdefs.IsNotFound(err) {
@@ -360,23 +369,12 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
 				return nil, err
 			}
 
-			imgrec = updated
+			img.i = updated
 		} else {
-			imgrec = created
+			img.i = created
 		}
-		break
+		return img, nil
 	}
-
-	img := &image{
-		client: c,
-		i:      imgrec,
-	}
-	if pullCtx.Unpack {
-		if err := img.Unpack(ctx, pullCtx.Snapshotter); err != nil {
-			errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
-		}
-	}
-	return img, nil
 }
 
 // Push uploads the provided content to a remote resource