Skip to content

Commit b018e55

Browse files
albersthaJeztah
authored andcommitted
Only complete removable containers if --force is not given
Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 147630a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent e283128 commit b018e55

File tree

1 file changed

+4
-1
lines changed
  • cli/command/container

1 file changed

+4
-1
lines changed

cli/command/container/rm.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/docker/cli/cli"
99
"github.com/docker/cli/cli/command"
1010
"github.com/docker/cli/cli/command/completion"
11+
"github.com/docker/docker/api/types"
1112
"github.com/docker/docker/api/types/container"
1213
"github.com/docker/docker/errdefs"
1314
"github.com/pkg/errors"
@@ -38,7 +39,9 @@ func NewRmCommand(dockerCli command.Cli) *cobra.Command {
3839
Annotations: map[string]string{
3940
"aliases": "docker container rm, docker container remove, docker rm",
4041
},
41-
ValidArgsFunction: completion.ContainerNames(dockerCli, true),
42+
ValidArgsFunction: completion.ContainerNames(dockerCli, true, func(ctr types.Container) bool {
43+
return opts.force || ctr.State == "exited" || ctr.State == "created"
44+
}),
4245
}
4346

4447
flags := cmd.Flags()

0 commit comments

Comments
 (0)