summaryrefslogtreecommitdiff
path: root/pkg/adapter
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2020-01-12 10:54:14 -0600
committerbaude <bbaude@redhat.com>2020-01-13 08:56:43 -0600
commit649331cb18427321d4640783e0ce4b61b83e567e (patch)
tree1a634a5c34e93f14d0567e2f4c5608d691ce102d /pkg/adapter
parent2d5fd7cc3718d27b35352e80c0c3296c5bb69c2f (diff)
downloadpodman-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 'pkg/adapter')
-rw-r--r--pkg/adapter/containers.go4
-rw-r--r--pkg/adapter/containers_remote.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index 3334e9fa1..c2206caad 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -1048,7 +1048,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{}
@@ -1100,7 +1100,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{}