add cli option to download all manifests

- Add `all-manifests` option to both `ctr content fetch` and `ctr
  images pull`. By default it is false.
- This option ties to `AppendDistributionSourceLabel` in client.

Signed-off-by: Yu Yi <yiyu@google.com>
This commit is contained in:
Yu Yi
2019-03-25 11:23:26 -04:00
committed by Derek McGowan
parent 4a2f61c4f2
commit 9e183f5e52
3 changed files with 30 additions and 5 deletions

View File

@@ -34,7 +34,7 @@ import (
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes"
digest "github.com/opencontainers/go-digest"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"
)
@@ -66,6 +66,10 @@ Most of this is experimental and there are few leaps to make this work.`,
Name: "all-platforms",
Usage: "pull content from all platforms",
},
cli.BoolFlag{
Name: "all-manifests",
Usage: "Pull manifests from all platforms and layers for a specific platform",
},
),
Action: func(clicontext *cli.Context) error {
var (
@@ -95,6 +99,8 @@ type FetchConfig struct {
Labels []string
// Platforms to fetch
Platforms []string
// Whether or not download all manifests
IsAllManifests bool
}
// NewFetchConfig returns the default FetchConfig from cli flags
@@ -117,6 +123,9 @@ func NewFetchConfig(ctx context.Context, clicontext *cli.Context) (*FetchConfig,
}
config.Platforms = p
}
if clicontext.Bool("all-manifests") {
config.IsAllManifests = clicontext.Bool("all-manifests")
}
return config, nil
}
@@ -149,7 +158,10 @@ func Fetch(ctx context.Context, client *containerd.Client, ref string, config *F
containerd.WithResolver(config.Resolver),
containerd.WithImageHandler(h),
containerd.WithSchema1Conversion,
containerd.WithAppendDistributionSourceLabel(),
}
if config.IsAllManifests {
opts = append(opts, containerd.WithAppendDistributionSourceLabel())
}
for _, platform := range config.Platforms {