diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-26 19:20:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 19:20:08 +0100 |
| commit | 6352f19d884ed5e3826cef453aef5506f14b69c1 (patch) | |
| tree | b7a0d51d0811d3115a75b0323b38f3ac99c3b8b2 /libpod/runtime_ctr.go | |
| parent | 1ad0d29fc2eb52fec707a4458fe31adc862e2862 (diff) | |
| parent | 83db80ce172975ddb7c5bfc0d1cea03d5c6b6c94 (diff) | |
| download | podman-6352f19d884ed5e3826cef453aef5506f14b69c1.tar.gz podman-6352f19d884ed5e3826cef453aef5506f14b69c1.tar.bz2 podman-6352f19d884ed5e3826cef453aef5506f14b69c1.zip | |
Merge pull request #2446 from mheon/add_image_volume
Only remove image volumes when removing containers
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 2ec8d0795..cfa4f9654 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -180,7 +180,7 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options .. if vol.Source[0] != '/' && isNamedVolume(vol.Source) { volInfo, err := r.state.Volume(vol.Source) if err != nil { - newVol, err := r.newVolume(ctx, WithVolumeName(vol.Source)) + newVol, err := r.newVolume(ctx, WithVolumeName(vol.Source), withSetCtrSpecific()) if err != nil { return nil, errors.Wrapf(err, "error creating named volume %q", vol.Source) } @@ -421,6 +421,9 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, for _, v := range volumes { if volume, err := runtime.state.Volume(v); err == nil { + if !volume.IsCtrSpecific() { + continue + } if err := runtime.removeVolume(ctx, volume, false); err != nil && err != ErrNoSuchVolume && err != ErrVolumeBeingUsed { logrus.Errorf("cleanup volume (%s): %v", v, err) } |