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

Merge pull request #6906 from ginglis13/6441-ctr-import

Browse Source
This commit is contained in:
Samuel Karp 2022-08-23 17:35:40 -07:00 committed by GitHub
commit 542e4b219d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/ctr/commands/images/import.go
View File

@ -89,9 +89,9 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
var ( var (
in = context.Args().First() in = context.Args().First()
opts []containerd.ImportOpt opts []containerd.ImportOpt
platformMacher platforms.MatchComparer platformMatcher platforms.MatchComparer
) )
prefix := context.String("base-name") prefix := context.String("base-name")
@ -126,8 +126,8 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
if err != nil { if err != nil {
return err return err
} }
platformMacher = platforms.Only(platSpec) platformMatcher = platforms.OnlyStrict(platSpec)
opts = append(opts, containerd.WithImportPlatform(platformMacher)) opts = append(opts, containerd.WithImportPlatform(platformMatcher))
} }
opts = append(opts, containerd.WithAllPlatforms(context.Bool("all-platforms"))) opts = append(opts, containerd.WithAllPlatforms(context.Bool("all-platforms")))
@ -160,10 +160,10 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
log.G(ctx).Debugf("unpacking %d images", len(imgs)) log.G(ctx).Debugf("unpacking %d images", len(imgs))
for _, img := range imgs { for _, img := range imgs {
if platformMacher == nil { // if platform not specified use default. if platformMatcher == nil { // if platform not specified use default.
platformMacher = platforms.Default() platformMatcher = platforms.Default()
} }
image := containerd.NewImageWithPlatform(client, img, platformMacher) image := containerd.NewImageWithPlatform(client, img, platformMatcher)
// TODO: Show unpack status // TODO: Show unpack status
fmt.Printf("unpacking %s (%s)...", img.Name, img.Target.Digest) fmt.Printf("unpacking %s (%s)...", img.Name, img.Target.Digest)