From 1febce4ca890cd3e1b0f4e9851032fc20a4cb829 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 9 Dec 2020 16:09:16 +0900 Subject: [PATCH] ctr: FetchConfig: allow setting additional []containerd.RemoteOpt The additional []containerd.RemoteOpt is not used by ctr currently, but planned to be used by nerdctl and also probably by stargz's ctr-remote. Signed-off-by: Akihiro Suda --- cmd/ctr/commands/content/fetch.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index ea94275c7..85841e1d8 100644 --- 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())