mirror of https://github.com/docker/cli.git
Use spf13/cobra for docker images
This fix is part of the effort to convert commands to spf13/cobra #23211. Thif fix coverted command `docker images` to use spf13/cobra NOTE: As part of this fix, a new function `RequiresMaxArgs()` has been defined in `cli/required.go`. This func returns an error if there is not at most max args Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
parent
c278d97aad
commit
fcd9f9f7bd
|
@ -51,6 +51,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
|
||||||
container.NewUnpauseCommand(dockerCli),
|
container.NewUnpauseCommand(dockerCli),
|
||||||
container.NewWaitCommand(dockerCli),
|
container.NewWaitCommand(dockerCli),
|
||||||
image.NewHistoryCommand(dockerCli),
|
image.NewHistoryCommand(dockerCli),
|
||||||
|
image.NewImagesCommand(dockerCli),
|
||||||
image.NewRemoveCommand(dockerCli),
|
image.NewRemoveCommand(dockerCli),
|
||||||
image.NewSearchCommand(dockerCli),
|
image.NewSearchCommand(dockerCli),
|
||||||
image.NewImportCommand(dockerCli),
|
image.NewImportCommand(dockerCli),
|
||||||
|
|
17
required.go
17
required.go
|
@ -43,6 +43,23 @@ func RequiresMinArgs(min int) cobra.PositionalArgs {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RequiresMaxArgs returns an error if there is not at most max args
|
||||||
|
func RequiresMaxArgs(max int) cobra.PositionalArgs {
|
||||||
|
return func(cmd *cobra.Command, args []string) error {
|
||||||
|
if len(args) <= max {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf(
|
||||||
|
"\"%s\" requires at most %d argument(s).\nSee '%s --help'.\n\nUsage: %s\n\n%s",
|
||||||
|
cmd.CommandPath(),
|
||||||
|
max,
|
||||||
|
cmd.CommandPath(),
|
||||||
|
cmd.UseLine(),
|
||||||
|
cmd.Short,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// RequiresMinMaxArgs returns an error if there is not at least min args and at most max args
|
// RequiresMinMaxArgs returns an error if there is not at least min args and at most max args
|
||||||
func RequiresMinMaxArgs(min int, max int) cobra.PositionalArgs {
|
func RequiresMinMaxArgs(min int, max int) cobra.PositionalArgs {
|
||||||
return func(cmd *cobra.Command, args []string) error {
|
return func(cmd *cobra.Command, args []string) error {
|
||||||
|
|
1
usage.go
1
usage.go
|
@ -13,7 +13,6 @@ var DockerCommandUsage = []Command{
|
||||||
{"cp", "Copy files/folders between a container and the local filesystem"},
|
{"cp", "Copy files/folders between a container and the local filesystem"},
|
||||||
{"events", "Get real time events from the server"},
|
{"events", "Get real time events from the server"},
|
||||||
{"exec", "Run a command in a running container"},
|
{"exec", "Run a command in a running container"},
|
||||||
{"images", "List images"},
|
|
||||||
{"info", "Display system-wide information"},
|
{"info", "Display system-wide information"},
|
||||||
{"inspect", "Return low-level information on a container or image"},
|
{"inspect", "Return low-level information on a container or image"},
|
||||||
{"load", "Load an image from a tar archive or STDIN"},
|
{"load", "Load an image from a tar archive or STDIN"},
|
||||||
|
|
Loading…
Reference in New Issue