Update ctr image pull all platforms

dmcgowan · dmcgowan · commit 1573ea598e00 · 2024-05-15T11:58:41.000-07:00
Allows supporting fetching of all platforms while unpacking for a subset of platforms. Signed-off-by: Derek McGowan <derek@mcg.dev> (cherry picked from commit 2788604) Signed-off-by: Derek McGowan <derek@mcg.dev>
diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go
@@ -100,24 +100,25 @@ command. As part of this process, we do the following:
 			}
 
 			var sopts []image.StoreOpt
-			if !context.Bool("all-platforms") {
-				var p []ocispec.Platform
-				for _, s := range context.StringSlice("platform") {
-					ps, err := platforms.Parse(s)
-					if err != nil {
-						return fmt.Errorf("unable to parse platform %s: %w", s, err)
-					}
-					p = append(p, ps)
+
+			var p []ocispec.Platform
+			for _, s := range context.StringSlice("platform") {
+				ps, err := platforms.Parse(s)
+				if err != nil {
+					return fmt.Errorf("unable to parse platform %s: %w", s, err)
 				}
+				p = append(p, ps)
+			}
+
+			// Set unpack configuration
+			for _, platform := range p {
+				sopts = append(sopts, image.WithUnpack(platform, context.String("snapshotter")))
+			}
+			if !context.Bool("all-platforms") {
 				if len(p) == 0 {
 					p = append(p, platforms.DefaultSpec())
 				}
 				sopts = append(sopts, image.WithPlatforms(p...))
-
-				// Set unpack configuration
-				for _, platform := range p {
-					sopts = append(sopts, image.WithUnpack(platform, context.String("snapshotter")))
-				}
 			}
 			// TODO: Support unpack for all platforms..?
 			// Pass in a *?
