diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-13 21:45:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 21:45:13 +0100 |
| commit | 6c3d383b50439058c57b9f3235643aaf168d3148 (patch) | |
| tree | c56162c26cd3f84182189f8a0e7927e336ad0811 /cmd/podman | |
| parent | 796ae87b1a3444557644944ddeb7cb37e303ef83 (diff) | |
| parent | 649331cb18427321d4640783e0ce4b61b83e567e (diff) | |
| download | podman-6c3d383b50439058c57b9f3235643aaf168d3148.tar.gz podman-6c3d383b50439058c57b9f3235643aaf168d3148.tar.bz2 podman-6c3d383b50439058c57b9f3235643aaf168d3148.zip | |
Merge pull request #4845 from baude/pruneforce
clarify cont
Diffstat (limited to 'cmd/podman')
| -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 6a86c24fd..cd9817e7e 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 bbca7b881..21b7aa711 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) |