diff options
| author | baude <bbaude@redhat.com> | 2020-01-12 10:54:14 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2020-01-13 08:56:43 -0600 |
| commit | 649331cb18427321d4640783e0ce4b61b83e567e (patch) | |
| tree | 1a634a5c34e93f14d0567e2f4c5608d691ce102d /cmd | |
| parent | 2d5fd7cc3718d27b35352e80c0c3296c5bb69c2f (diff) | |
| download | podman-649331cb18427321d4640783e0ce4b61b83e567e.tar.gz podman-649331cb18427321d4640783e0ce4b61b83e567e.tar.bz2 podman-649331cb18427321d4640783e0ce4b61b83e567e.zip | |
clarify container prune --force
the --force parameter should only be used for the CLI and should only
dictate whether to prompt the user for confirmation.
Fixes: #4844
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers_prune.go | 4 | ||||
| -rw-r--r-- | cmd/podman/system_prune.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/containers_prune.go b/cmd/podman/containers_prune.go index 78c50268c..368ccdf2c 100644 --- a/cmd/podman/containers_prune.go +++ b/cmd/podman/containers_prune.go @@ -40,7 +40,7 @@ func init() { pruneContainersCommand.SetHelpTemplate(HelpTemplate()) pruneContainersCommand.SetUsageTemplate(UsageTemplate()) flags := pruneContainersCommand.Flags() - flags.BoolVarP(&pruneContainersCommand.Force, "force", "f", false, "Force removal of a running container. The default is false") + flags.BoolVarP(&pruneContainersCommand.Force, "force", "f", false, "Skip interactive prompt for container removal") flags.StringArrayVar(&pruneContainersCommand.Filter, "filter", []string{}, "Provide filter values (e.g. 'until=<timestamp>')") } @@ -68,7 +68,7 @@ Are you sure you want to continue? [y/N] `) if c.GlobalIsSet("max-workers") { maxWorkers = c.GlobalFlags.MaxWorks } - ok, failures, err := runtime.Prune(getContext(), maxWorkers, c.Force, c.Filter) + ok, failures, err := runtime.Prune(getContext(), maxWorkers, c.Filter) if err != nil { if errors.Cause(err) == define.ErrNoSuchCtr { if len(c.InputArgs) > 1 { diff --git a/cmd/podman/system_prune.go b/cmd/podman/system_prune.go index 74fdcde99..28f22d33f 100644 --- a/cmd/podman/system_prune.go +++ b/cmd/podman/system_prune.go @@ -92,7 +92,7 @@ Are you sure you want to continue? [y/N] `, volumeString) rmWorkers := shared.Parallelize("rm") fmt.Println("Deleted Containers") - ok, failures, err = runtime.Prune(ctx, rmWorkers, false, []string{}) + ok, failures, err = runtime.Prune(ctx, rmWorkers, []string{}) if err != nil { if lasterr != nil { logrus.Errorf("%q", err) |