[27.x backport] assorted improvements for shell completion by thaJeztah · Pull Request #5540 · docker/cli (original) (raw)

Had to apply a small patch in the last commit due to the master branch using a type that was moved;

44.74 # github.com/docker/cli/cli/command/container
44.74 cli/command/container/rm.go:41:84: undefined: container.Summary

diff --git a/cli/command/container/rm.go b/cli/command/container/rm.go index 12beef64f..b234b6009 100644 --- a/cli/command/container/rm.go +++ b/cli/command/container/rm.go @@ -8,6 +8,7 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/completion"

•   "github.com/docker/docker/api/types"
    "github.com/docker/docker/api/types/container"
    "github.com/docker/docker/errdefs"
    "github.com/pkg/errors"

@@ -38,7 +39,7 @@ func NewRmCommand(dockerCli command.Cli) *cobra.Command { Annotations: map[string]string{ "aliases": "docker container rm, docker container remove, docker rm", },

•           ValidArgsFunction: completion.ContainerNames(dockerCli, true, func(ctr container.Summary) bool {

•           ValidArgsFunction: completion.ContainerNames(dockerCli, true, func(ctr types.Container) bool {
                    return opts.force || ctr.State == "exited" || ctr.State == "created"
            }),
    }