diff --git a/driver/docker-container/driver.go b/driver/docker-container/driver.go index a0b261d7..d240b04a 100644 --- a/driver/docker-container/driver.go +++ b/driver/docker-container/driver.go @@ -275,15 +275,24 @@ func (d *Driver) Rm(ctx context.Context, force bool, rmVolume bool) error { return err } if info.Status != driver.Inactive { + container, err := d.DockerAPI.ContainerInspect(ctx, d.Name) + if err != nil { + return err + } if err := d.DockerAPI.ContainerRemove(ctx, d.Name, dockertypes.ContainerRemoveOptions{ RemoveVolumes: true, Force: force, }); err != nil { return err } - if rmVolume { - return d.DockerAPI.VolumeRemove(ctx, d.Name+volumeStateSuffix, false) + for _, v := range container.Mounts { + if v.Name == d.Name+volumeStateSuffix { + if rmVolume { + return d.DockerAPI.VolumeRemove(ctx, d.Name+volumeStateSuffix, false) + } + } } + } return nil }