From 6fd9c57744884ed4fefb992370988e8f7da9dcd0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 15 May 2025 12:50:47 +0200 Subject: [PATCH] cli/command/container: use ContainerState consts Signed-off-by: Sebastiaan van Stijn --- cli/command/container/attach.go | 2 +- cli/command/container/exec.go | 2 +- cli/command/container/pause.go | 2 +- cli/command/container/rm.go | 2 +- cli/command/container/start.go | 2 +- cli/command/container/unpause.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/command/container/attach.go b/cli/command/container/attach.go index a4dbe0ec0d..f5ee5cf311 100644 --- a/cli/command/container/attach.go +++ b/cli/command/container/attach.go @@ -56,7 +56,7 @@ func NewAttachCommand(dockerCLI command.Cli) *cobra.Command { "aliases": "docker container attach, docker attach", }, ValidArgsFunction: completion.ContainerNames(dockerCLI, false, func(ctr container.Summary) bool { - return ctr.State != "paused" + return ctr.State != container.StatePaused }), } diff --git a/cli/command/container/exec.go b/cli/command/container/exec.go index 00f58ede18..7d521700a5 100644 --- a/cli/command/container/exec.go +++ b/cli/command/container/exec.go @@ -53,7 +53,7 @@ func NewExecCommand(dockerCli command.Cli) *cobra.Command { return RunExec(cmd.Context(), dockerCli, containerIDorName, options) }, ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr container.Summary) bool { - return ctr.State != "paused" + return ctr.State != container.StatePaused }), Annotations: map[string]string{ "category-top": "2", diff --git a/cli/command/container/pause.go b/cli/command/container/pause.go index b2a40aa705..78dc6fe37d 100644 --- a/cli/command/container/pause.go +++ b/cli/command/container/pause.go @@ -32,7 +32,7 @@ func NewPauseCommand(dockerCli command.Cli) *cobra.Command { "aliases": "docker container pause, docker pause", }, ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr container.Summary) bool { - return ctr.State != "paused" + return ctr.State != container.StatePaused }), } } diff --git a/cli/command/container/rm.go b/cli/command/container/rm.go index 627b042f0b..4295f9e382 100644 --- a/cli/command/container/rm.go +++ b/cli/command/container/rm.go @@ -39,7 +39,7 @@ func NewRmCommand(dockerCli command.Cli) *cobra.Command { "aliases": "docker container rm, docker container remove, docker rm", }, ValidArgsFunction: completion.ContainerNames(dockerCli, true, func(ctr container.Summary) bool { - return opts.force || ctr.State == "exited" || ctr.State == "created" + return opts.force || ctr.State == container.StateExited || ctr.State == container.StateCreated }), } diff --git a/cli/command/container/start.go b/cli/command/container/start.go index 29aaa988d6..a71bdc8fde 100644 --- a/cli/command/container/start.go +++ b/cli/command/container/start.go @@ -43,7 +43,7 @@ func NewStartCommand(dockerCli command.Cli) *cobra.Command { "aliases": "docker container start, docker start", }, ValidArgsFunction: completion.ContainerNames(dockerCli, true, func(ctr container.Summary) bool { - return ctr.State == "exited" || ctr.State == "created" + return ctr.State == container.StateExited || ctr.State == container.StateCreated }), } diff --git a/cli/command/container/unpause.go b/cli/command/container/unpause.go index 7824f4a76f..fd5a516cac 100644 --- a/cli/command/container/unpause.go +++ b/cli/command/container/unpause.go @@ -32,7 +32,7 @@ func NewUnpauseCommand(dockerCli command.Cli) *cobra.Command { "aliases": "docker container unpause, docker unpause", }, ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr container.Summary) bool { - return ctr.State == "paused" + return ctr.State == container.StatePaused }), } return cmd