Merge pull request #4820 from AkihiroSuda/additional-pull-opts

fuweid · web-flow · commit 7b0149ac4a8a · 2020-12-10T00:38:59.000+08:00
ctr: FetchConfig: allow setting additional []containerd.RemoteOpt
diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go
@@ -108,6 +108,8 @@ type FetchConfig struct {
 	Platforms []string
 	// Whether or not download all metadata
 	AllMetadata bool
+	// RemoteOpts is not used by ctr, but can be used by other CLI tools
+	RemoteOpts []containerd.RemoteOpt
 }
 
 // NewFetchConfig returns the default FetchConfig from cli flags
@@ -172,6 +174,7 @@ func Fetch(ctx context.Context, client *containerd.Client, ref string, config *F
 		containerd.WithImageHandler(h),
 		containerd.WithSchema1Conversion,
 	}
+	opts = append(opts, config.RemoteOpts...)
 
 	if config.AllMetadata {
 		opts = append(opts, containerd.WithAllMetadata())

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,8 @@ type FetchConfig struct {`
`108`	`108`	`Platforms []string`
`109`	`109`	`// Whether or not download all metadata`
`110`	`110`	`AllMetadata bool`
	`111`	`+ // RemoteOpts is not used by ctr, but can be used by other CLI tools`
	`112`	`+ RemoteOpts []containerd.RemoteOpt`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`// NewFetchConfig returns the default FetchConfig from cli flags`
`@@ -172,6 +174,7 @@ func Fetch(ctx context.Context, client containerd.Client, ref string, config F`
`172`	`174`	`containerd.WithImageHandler(h),`
`173`	`175`	`containerd.WithSchema1Conversion,`
`174`	`176`	`}`
	`177`	`+ opts = append(opts, config.RemoteOpts...)`
`175`	`178`
`176`	`179`	`if config.AllMetadata {`
`177`	`180`	`opts = append(opts, containerd.WithAllMetadata())`