Merge pull request #3505 from crosbymichael/remoteopts-unpack

crosbymichael · web-flow · commit 23faecfb66ab · 2019-08-08T13:20:34.000-04:00
Add UnpackOpts to RemoteContext
diff --git a/client.go b/client.go
@@ -298,6 +298,9 @@ type RemoteContext struct {
 	// afterwards. Unpacking is required to run an image.
 	Unpack bool
 
+	// UnpackOpts handles options to the unpack call.
+	UnpackOpts []UnpackOpt
+
 	// Snapshotter used for unpacking
 	Snapshotter string
 
diff --git a/pull.go b/pull.go
@@ -69,7 +69,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
 	i := NewImageWithPlatform(c, img, pullCtx.PlatformMatcher)
 
 	if pullCtx.Unpack {
-		if err := i.Unpack(ctx, pullCtx.Snapshotter); err != nil {
+		if err := i.Unpack(ctx, pullCtx.Snapshotter, pullCtx.UnpackOpts...); err != nil {
 			return nil, errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image`
`69`	`69`	`i := NewImageWithPlatform(c, img, pullCtx.PlatformMatcher)`
`70`	`70`
`71`	`71`	`if pullCtx.Unpack {`
`72`		`- if err := i.Unpack(ctx, pullCtx.Snapshotter); err != nil {`
	`72`	`+ if err := i.Unpack(ctx, pullCtx.Snapshotter, pullCtx.UnpackOpts...); err != nil {`
`73`	`73`	`return nil, errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)`
`74`	`74`	`}`
`75`	`75`	`}`