Add support for multiple platforms in docker image load.

Signed-off-by: Cesar Talledo <[email protected]>

Author: ctalledo

cli/command/image/load.go

@@ -11,14 +11,15 @@ import (
 	"github.com/docker/cli/internal/jsonstream"
 	"github.com/docker/docker/client"
 	"github.com/moby/sys/sequential"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
 type loadOptions struct {
 	input    string
 	quiet    bool
-	platform string
+	platform []string
 }
 
 // NewLoadCommand creates a new `docker load` command
@@ -42,7 +43,7 @@ func NewLoadCommand(dockerCli command.Cli) *cobra.Command {
 
 	flags.StringVarP(&opts.input, "input", "i", "", "Read from tar archive file, instead of STDIN")
 	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Suppress the load output")
-	flags.StringVar(&opts.platform, "platform", "", `Load only the given platform variant. Formatted as "os[/arch[/variant]]" (e.g., "linux/amd64")`)
+	flags.StringSliceVar(&opts.platform, "platform", []string{}, `Load only the given platform(s). Formatted as a comma-separated list of "os[/arch[/variant]]" (e.g., "linux/amd64,linux/arm64/v8").`)
 	_ = flags.SetAnnotation("platform", "version", []string{"1.48"})
 
 	_ = cmd.RegisterFlagCompletionFunc("platform", completion.Platforms)
@@ -76,13 +77,16 @@ func runLoad(ctx context.Context, dockerCli command.Cli, opts loadOptions) error
 		options = append(options, client.ImageLoadWithQuiet(true))
 	}
 
-	if opts.platform != "" {
-		p, err := platforms.Parse(opts.platform)
+	platformList := []ocispec.Platform{}
+	for _, p := range opts.platform {
+		pp, err := platforms.Parse(p)
 		if err != nil {
 			return errors.Wrap(err, "invalid platform")
 		}
-		// TODO(thaJeztah): change flag-type to support multiple platforms.
-		options = append(options, client.ImageLoadWithPlatforms(p))
+		platformList = append(platformList, pp)
+	}
+	if len(platformList) > 0 {
+		options = append(options, client.ImageLoadWithPlatforms(platformList...))
 	}
 
 	response, err := dockerCli.Client().ImageLoad(ctx, input, options...)

cli/command/image/load_test.go

@@ -104,7 +104,7 @@ func TestNewLoadCommandSuccess(t *testing.T) {
 			},
 		},
 		{
-			name: "with platform",
+			name: "with-single-platform",
 			args: []string{"--platform", "linux/amd64"},
 			imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (image.LoadResponse, error) {
 				// FIXME(thaJeztah): need to find appropriate way to test the result of "ImageHistoryWithPlatform" being applied
@@ -113,6 +113,22 @@ func TestNewLoadCommandSuccess(t *testing.T) {
 				return image.LoadResponse{Body: io.NopCloser(strings.NewReader("Success"))}, nil
 			},
 		},
+		{
+			name: "with-comma-separated-platforms",
+			args: []string{"--platform", "linux/amd64,linux/arm64/v8,linux/riscv64"},
+			imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (image.LoadResponse, error) {
+				assert.Check(t, len(options) > 0) // can be 1 or two depending on whether a terminal is attached :/
+				return image.LoadResponse{Body: io.NopCloser(strings.NewReader("Success"))}, nil
+			},
+		},
+		{
+			name: "with-multiple-platform-options",
+			args: []string{"--platform", "linux/amd64", "--platform", "linux/arm64/v8", "--platform", "linux/riscv64"},
+			imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (image.LoadResponse, error) {
+				assert.Check(t, len(options) > 0) // can be 1 or two depending on whether a terminal is attached :/
+				return image.LoadResponse{Body: io.NopCloser(strings.NewReader("Success"))}, nil
+			},
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {

cli/command/image/testdata/load-command-success.with platform.golden renamed to cli/command/image/testdata/load-command-success.with-comma-separated-platforms.golden

@@ -0,0 +1 @@
+Success

cli/command/image/testdata/load-command-success.with-multiple-platform-options.golden

@@ -0,0 +1 @@
+Success