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

Merge pull request #11139 from k8s-infra-cherrypick-robot/cherry-pick-11086-to-release/2.0

Browse Source 
[release/2.0] ctr pull should unpack for default platform when transfer service is used
This commit is contained in:
Derek McGowan 2024-12-12 11:05:34 -08:00 committed by GitHub
commit c11f124500
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/ctr/commands/images/pull.go
View File

@ -119,19 +119,20 @@ command. As part of this process, we do the following:
if err != nil { if err != nil {
return err return err
} }
allPlatforms := cliContext.Bool("all-platforms")
// Set unpack configuration if len(p) > 0 && allPlatforms {
return errors.New("cannot specify both --platform and --all-platforms")
}
if len(p) == 0 && !allPlatforms {
p = append(p, platforms.DefaultSpec())
}
// we use an empty `Platform` slice to indicate that we want to pull all platforms
sopts = append(sopts, image.WithPlatforms(p...))
// TODO: Support unpack for all platforms..?
// Pass in a *?
for _, platform := range p { for _, platform := range p {
sopts = append(sopts, image.WithUnpack(platform, cliContext.String("snapshotter"))) sopts = append(sopts, image.WithUnpack(platform, cliContext.String("snapshotter")))
} }
if !cliContext.Bool("all-platforms") {
if len(p) == 0 {
p = append(p, platforms.DefaultSpec())
}
sopts = append(sopts, image.WithPlatforms(p...))
}
// TODO: Support unpack for all platforms..?
// Pass in a *?
if cliContext.Bool("metadata-only") { if cliContext.Bool("metadata-only") {
sopts = append(sopts, image.WithAllMetadata) sopts = append(sopts, image.WithAllMetadata)