diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-19 19:37:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-19 19:37:00 +0100 |
commit | a359ca0d1825859dd8b7c1384f11d703ec6625b4 (patch) | |
tree | a493650454ba9d9728fe9a1aa191bd5fcbab742c /libpod/runtime_ctr.go | |
parent | dde48b44e725a3da959c627519e8110ec992a26e (diff) | |
parent | 88917e4a939f23bedf17fdf470ca1a2c387045eb (diff) | |
download | podman-a359ca0d1825859dd8b7c1384f11d703ec6625b4.tar.gz podman-a359ca0d1825859dd8b7c1384f11d703ec6625b4.tar.bz2 podman-a359ca0d1825859dd8b7c1384f11d703ec6625b4.zip |
Merge pull request #4723 from mheon/pod_volume_postremove
Remove volumes after containers in pod remove
Diffstat (limited to 'libpod/runtime_ctr.go')
-rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index ae401013c..d272e4549 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -573,7 +573,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, if !volume.IsCtrSpecific() { continue } - if err := runtime.removeVolume(ctx, volume, false); err != nil && err != define.ErrNoSuchVolume && err != define.ErrVolumeBeingUsed { + if err := runtime.removeVolume(ctx, volume, false); err != nil && errors.Cause(err) != define.ErrNoSuchVolume { logrus.Errorf("cleanup volume (%s): %v", v, err) } } |