diff options
| author | Qi Wang <qiwan@redhat.com> | 2019-11-04 15:07:24 -0500 |
|---|---|---|
| committer | Qi Wang <qiwan@redhat.com> | 2019-11-26 13:19:31 -0500 |
| commit | d9400cced2afad61eafa18da661891a96db1eafc (patch) | |
| tree | 6672d5b506ac9355eabdca1804dc62060ac91867 /cmd | |
| parent | f5ef3d59bcc7e7beae8716ab10153e1eafd634c1 (diff) | |
| download | podman-d9400cced2afad61eafa18da661891a96db1eafc.tar.gz podman-d9400cced2afad61eafa18da661891a96db1eafc.tar.bz2 podman-d9400cced2afad61eafa18da661891a96db1eafc.zip | |
Remove containers when pruning a stopped pod.
This path allows pod prune & pod rm to remove stopped containers in the pod before deleting the pod.
PrunePods and RemovePod should be able to remove containers without force removal of stopped pods.
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/pod_rm.go | 2 | ||||
| -rw-r--r-- | cmd/podman/pods_prune.go | 4 | ||||
| -rw-r--r-- | cmd/podman/system_prune.go | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cmd/podman/pod_rm.go b/cmd/podman/pod_rm.go index fcf1d5bc7..02daf8764 100644 --- a/cmd/podman/pod_rm.go +++ b/cmd/podman/pod_rm.go @@ -12,7 +12,7 @@ import ( var ( podRmCommand cliconfig.PodRmValues - podRmDescription = fmt.Sprintf(`podman rm will remove one or more pods from the host. + podRmDescription = fmt.Sprintf(`podman rm will remove one or more stopped pods and their containers from the host. The pod name or ID can be used. A pod with containers will not be removed without --force. If --force is specified, all containers will be stopped, then removed.`) _podRmCommand = &cobra.Command{ 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 { diff --git a/cmd/podman/system_prune.go b/cmd/podman/system_prune.go index c4d76b2dd..ae5d7ed2d 100644 --- a/cmd/podman/system_prune.go +++ b/cmd/podman/system_prune.go @@ -82,7 +82,6 @@ Are you sure you want to continue? [y/N] `, volumeString) fmt.Println("Deleted Pods") pruneValues := cliconfig.PodPruneValues{ PodmanCommand: c.PodmanCommand, - Force: c.Force, } ctx := getContext() ok, failures, lasterr := runtime.PrunePods(ctx, &pruneValues) |