github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3915 from yeahdongcn/push

Browse Source 
Support pushing a specific platform of a multi-architecture docker image to a registry
This commit is contained in:
Phil Estes 2020-01-02 12:26:35 -05:00 committed by GitHub
commit b95fa01b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/ctr/commands/images/push.go
View File

@ -29,6 +29,7 @@ import (
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
@ -58,6 +59,10 @@ var pushCommand = cli.Command{
Name: "manifest-type", Name: "manifest-type",
Usage: "media type of manifest digest", Usage: "media type of manifest digest",
Value: ocispec.MediaTypeImageManifest, Value: ocispec.MediaTypeImageManifest,
}, cli.StringSliceFlag{
Name: "platform",
Usage: "push content from a specific platform",
Value: &cli.StringSlice{},
}), }),
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
var ( var (
@ -91,6 +96,27 @@ var pushCommand = cli.Command{
return errors.Wrap(err, "unable to resolve image to manifest") return errors.Wrap(err, "unable to resolve image to manifest")
} }
desc = img.Target desc = img.Target
if pss := context.StringSlice("platform"); len(pss) == 1 {
p, err := platforms.Parse(pss[0])
if err != nil {
return errors.Wrapf(err, "invalid platform %q", pss[0])
}
cs := client.ContentStore()
if manifests, err := images.Children(ctx, cs, desc); err == nil && len(manifests) > 0 {
matcher := platforms.NewMatcher(p)
for _, manifest := range manifests {
if manifest.Platform != nil && matcher.Match(*manifest.Platform) {
if _, err := images.Children(ctx, cs, manifest); err != nil {
return errors.Wrap(err, "no matching manifest")
}
desc = manifest
break
}
}
}
}
} }
resolver, err := commands.GetResolver(ctx, context) resolver, err := commands.GetResolver(ctx, context)