summaryrefslogtreecommitdiff
path: root/cmd/podman/pods_prune.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-26 20:43:28 +0100
committerGitHub <noreply@github.com>2019-11-26 20:43:28 +0100
commit27a09f8fab740749964d28b5ead1a43c6d77a7c8 (patch)
tree347d5a8156f612a52843264bc1e264136794549d /cmd/podman/pods_prune.go
parentb29928f01598810328fa6b0cf91abb84670d8d01 (diff)
parentd9400cced2afad61eafa18da661891a96db1eafc (diff)
downloadpodman-27a09f8fab740749964d28b5ead1a43c6d77a7c8.tar.gz
podman-27a09f8fab740749964d28b5ead1a43c6d77a7c8.tar.bz2
podman-27a09f8fab740749964d28b5ead1a43c6d77a7c8.zip
Merge pull request #4443 from QiWang19/prune_pod
Remove containers when pod prune & pod rm.
Diffstat (limited to 'cmd/podman/pods_prune.go')
-rw-r--r--cmd/podman/pods_prune.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/pods_prune.go b/cmd/podman/pods_prune.go
index d40e37bdb..1c5c0bb58 100644
--- a/cmd/podman/pods_prune.go
+++ b/cmd/podman/pods_prune.go
@@ -17,7 +17,7 @@ var (
_prunePodsCommand = &cobra.Command{
Use: "prune",
Args: noSubArgs,
- Short: "Remove all stopped pods",
+ Short: "Remove all stopped pods and their containers",
Long: podPruneDescription,
RunE: func(cmd *cobra.Command, args []string) error {
podPruneCommand.InputArgs = args
@@ -32,7 +32,7 @@ func init() {
podPruneCommand.SetHelpTemplate(HelpTemplate())
podPruneCommand.SetUsageTemplate(UsageTemplate())
flags := podPruneCommand.Flags()
- flags.BoolVarP(&podPruneCommand.Force, "force", "f", false, "Force removal of a running pods. The default is false")
+ flags.BoolVarP(&podPruneCommand.Force, "force", "f", false, "Force removal of all running pods. The default is false")
}
func podPruneCmd(c *cliconfig.PodPruneValues) error {