0adaf6be3b
This replaces the visitAll recursive function with a test that verifies that the option is set for all commands and subcommands, so that it doesn't have to be modified at runtime. We currently still have to loop over all functions for the setValidateArgs call, but that can be looked at separately. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
96 lines
2.5 KiB
Go
96 lines
2.5 KiB
Go
package image
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/completion"
|
|
"github.com/docker/cli/internal/jsonstream"
|
|
dockeropts "github.com/docker/cli/opts"
|
|
"github.com/moby/moby/client"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type importOptions struct {
|
|
source string
|
|
reference string
|
|
changes dockeropts.ListOpts
|
|
message string
|
|
platform string
|
|
}
|
|
|
|
// newImportCommand creates a new "docker image import" command.
|
|
func newImportCommand(dockerCLI command.Cli) *cobra.Command {
|
|
var options importOptions
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "import [OPTIONS] file|URL|- [REPOSITORY[:TAG]]",
|
|
Short: "Import the contents from a tarball to create a filesystem image",
|
|
Args: cli.RequiresMinArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
options.source = args[0]
|
|
if len(args) > 1 {
|
|
options.reference = args[1]
|
|
}
|
|
return runImport(cmd.Context(), dockerCLI, options)
|
|
},
|
|
Annotations: map[string]string{
|
|
"aliases": "docker image import, docker import",
|
|
},
|
|
DisableFlagsInUseLine: true,
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
|
|
options.changes = dockeropts.NewListOpts(nil)
|
|
flags.VarP(&options.changes, "change", "c", "Apply Dockerfile instruction to the created image")
|
|
flags.StringVarP(&options.message, "message", "m", "", "Set commit message for imported image")
|
|
addPlatformFlag(flags, &options.platform)
|
|
_ = cmd.RegisterFlagCompletionFunc("platform", completion.Platforms)
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runImport(ctx context.Context, dockerCli command.Cli, options importOptions) error {
|
|
var source client.ImageImportSource
|
|
switch {
|
|
case options.source == "-":
|
|
// import from STDIN
|
|
source = client.ImageImportSource{
|
|
Source: dockerCli.In(),
|
|
SourceName: options.source,
|
|
}
|
|
case strings.HasPrefix(options.source, "https://"), strings.HasPrefix(options.source, "http://"):
|
|
// import from a remote source (handled by the daemon)
|
|
source = client.ImageImportSource{
|
|
SourceName: options.source,
|
|
}
|
|
default:
|
|
// import from a local file
|
|
file, err := os.Open(options.source)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer file.Close()
|
|
source = client.ImageImportSource{
|
|
Source: file,
|
|
SourceName: "-",
|
|
}
|
|
}
|
|
|
|
responseBody, err := dockerCli.Client().ImageImport(ctx, source, options.reference, client.ImageImportOptions{
|
|
Message: options.message,
|
|
Changes: options.changes.GetSlice(),
|
|
Platform: options.platform,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer responseBody.Close()
|
|
|
|
return jsonstream.Display(ctx, responseBody, dockerCli.Out())
|
|
}
|