diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-26 20:43:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 20:43:28 +0100 |
| commit | 27a09f8fab740749964d28b5ead1a43c6d77a7c8 (patch) | |
| tree | 347d5a8156f612a52843264bc1e264136794549d /pkg | |
| parent | b29928f01598810328fa6b0cf91abb84670d8d01 (diff) | |
| parent | d9400cced2afad61eafa18da661891a96db1eafc (diff) | |
| download | podman-27a09f8fab740749964d28b5ead1a43c6d77a7c8.tar.gz podman-27a09f8fab740749964d28b5ead1a43c6d77a7c8.tar.bz2 podman-27a09f8fab740749964d28b5ead1a43c6d77a7c8.zip | |
Merge pull request #4443 from QiWang19/prune_pod
Remove containers when pod prune & pod rm.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/pods.go | 4 | ||||
| -rw-r--r-- | pkg/varlinkapi/pods.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go index e9f3d41a9..a726153c0 100644 --- a/pkg/adapter/pods.go +++ b/pkg/adapter/pods.go @@ -77,7 +77,7 @@ func (r *LocalRuntime) PrunePods(ctx context.Context, cli *cliconfig.PodPruneVal pool.Add(shared.Job{ ID: p.ID(), Fn: func() error { - err := r.Runtime.RemovePod(ctx, p, cli.Force, cli.Force) + err := r.Runtime.RemovePod(ctx, p, true, cli.Force) if err != nil { logrus.Debugf("Failed to remove pod %s: %s", p.ID(), err.Error()) } @@ -101,7 +101,7 @@ func (r *LocalRuntime) RemovePods(ctx context.Context, cli *cliconfig.PodRmValue } for _, p := range pods { - if err := r.Runtime.RemovePod(ctx, p, cli.Force, cli.Force); err != nil { + if err := r.Runtime.RemovePod(ctx, p, true, cli.Force); err != nil { errs = append(errs, err) } else { podids = append(podids, p.ID()) diff --git a/pkg/varlinkapi/pods.go b/pkg/varlinkapi/pods.go index 9b659f66b..1ebe5d424 100644 --- a/pkg/varlinkapi/pods.go +++ b/pkg/varlinkapi/pods.go @@ -247,7 +247,7 @@ func (i *LibpodAPI) RemovePod(call iopodman.VarlinkCall, name string, force bool if err != nil { return call.ReplyPodNotFound(name, err.Error()) } - if err = i.Runtime.RemovePod(ctx, pod, force, force); err != nil { + if err = i.Runtime.RemovePod(ctx, pod, true, force); err != nil { return call.ReplyErrorOccurred(err.Error()) } |