80b1285fec
Cobra allows for aliases to be defined for a command, but only allows these
to be defined at the same level (for example, `docker image ls` as alias for
`docker image list`). Our CLI has some commands that are available both as a
top-level shorthand as well as `docker <object> <verb>` subcommands. For example,
`docker ps` is a shorthand for `docker container ps` / `docker container ls`.
This patch introduces a custom "aliases" annotation that can be used to print
all available aliases for a command. While this requires these aliases to be
defined manually, in practice the list of aliases rarely changes, so maintenance
should be minimal.
As a convention, we could consider the first command in this list to be the
canonical command, so that we can use this information to add redirects in
our documentation in future.
Before this patch:
docker images --help
Usage: docker images [OPTIONS] [REPOSITORY[:TAG]]
List images
Options:
-a, --all Show all images (default hides intermediate images)
...
With this patch:
docker images --help
Usage: docker images [OPTIONS] [REPOSITORY[:TAG]]
List images
Aliases:
docker image ls, docker image list, docker images
Options:
-a, --all Show all images (default hides intermediate images)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
81 lines
2.1 KiB
Go
81 lines
2.1 KiB
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/completion"
|
|
"github.com/docker/cli/opts"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type commitOptions struct {
|
|
container string
|
|
reference string
|
|
|
|
pause bool
|
|
comment string
|
|
author string
|
|
changes opts.ListOpts
|
|
}
|
|
|
|
// NewCommitCommand creates a new cobra.Command for `docker commit`
|
|
func NewCommitCommand(dockerCli command.Cli) *cobra.Command {
|
|
var options commitOptions
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "commit [OPTIONS] CONTAINER [REPOSITORY[:TAG]]",
|
|
Short: "Create a new image from a container's changes",
|
|
Args: cli.RequiresRangeArgs(1, 2),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
options.container = args[0]
|
|
if len(args) > 1 {
|
|
options.reference = args[1]
|
|
}
|
|
return runCommit(dockerCli, &options)
|
|
},
|
|
Annotations: map[string]string{
|
|
"aliases": "docker container commit, docker commit",
|
|
},
|
|
ValidArgsFunction: completion.ContainerNames(dockerCli, false),
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.SetInterspersed(false)
|
|
|
|
flags.BoolVarP(&options.pause, "pause", "p", true, "Pause container during commit")
|
|
flags.StringVarP(&options.comment, "message", "m", "", "Commit message")
|
|
flags.StringVarP(&options.author, "author", "a", "", "Author (e.g., \"John Hannibal Smith <hannibal@a-team.com>\")")
|
|
|
|
options.changes = opts.NewListOpts(nil)
|
|
flags.VarP(&options.changes, "change", "c", "Apply Dockerfile instruction to the created image")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runCommit(dockerCli command.Cli, options *commitOptions) error {
|
|
ctx := context.Background()
|
|
|
|
name := options.container
|
|
reference := options.reference
|
|
|
|
commitOptions := types.ContainerCommitOptions{
|
|
Reference: reference,
|
|
Comment: options.comment,
|
|
Author: options.author,
|
|
Changes: options.changes.GetAll(),
|
|
Pause: options.pause,
|
|
}
|
|
|
|
response, err := dockerCli.Client().ContainerCommit(ctx, name, commitOptions)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintln(dockerCli.Out(), response.ID)
|
|
return nil
|
|
}
|