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 /pkg | |
| 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 'pkg')
| -rw-r--r-- | pkg/adapter/containers.go | 4 | ||||
| -rw-r--r-- | pkg/adapter/containers_remote.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go index c348d2130..8b21d6b94 100644 --- a/pkg/adapter/containers.go +++ b/pkg/adapter/containers.go @@ -1050,7 +1050,7 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal } // Prune removes stopped containers -func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, filters []string) ([]string, map[string]error, error) { +func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, filters []string) ([]string, map[string]error, error) { var ( ok = []string{} failures = map[string]error{} @@ -1102,7 +1102,7 @@ func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, fi pool.Add(shared.Job{ ID: ctr.ID(), Fn: func() error { - err := r.Runtime.RemoveContainer(ctx, ctr, force, false) + err := r.Runtime.RemoveContainer(ctx, ctr, false, false) if err != nil { logrus.Debugf("Failed to prune container %s: %s", ctr.ID(), err.Error()) } diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go index 36db4af68..60ee3cb2d 100644 --- a/pkg/adapter/containers_remote.go +++ b/pkg/adapter/containers_remote.go @@ -922,7 +922,7 @@ func (r *LocalRuntime) Top(cli *cliconfig.TopValues) ([]string, error) { } // Prune removes stopped containers -func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, filter []string) ([]string, map[string]error, error) { +func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, filter []string) ([]string, map[string]error, error) { var ( ok = []string{} |