diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-09-10 13:26:30 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-09-10 13:30:50 -0400 |
| commit | 3e92bcbf7103c5469fdb37ca3d6aeb53ef93a48f (patch) | |
| tree | 98fba7ba480816786ae4d948d657f8cbb0a54b4e | |
| parent | c1761ba1ac4155bab82fb9b847ccf96489b98265 (diff) | |
| download | podman-3e92bcbf7103c5469fdb37ca3d6aeb53ef93a48f.tar.gz podman-3e92bcbf7103c5469fdb37ca3d6aeb53ef93a48f.tar.bz2 podman-3e92bcbf7103c5469fdb37ca3d6aeb53ef93a48f.zip | |
Do not prune images being used by a container
Podman is not the only user of containers/storage, and as such we
cannot rely on our database as the sole source of truth when
pruning images. If images do not show as in use from Podman's
perspective, but subsequently fail to remove because they are
being used by a container, they're probably being used by Buildah
or another c/storage client.
Since the images in question are in use, we shouldn't error on
failure to prune them - we weren't supposed to prune them in the
first place.
Fixes: #3983
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| -rw-r--r-- | libpod/image/prune.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/image/prune.go b/libpod/image/prune.go index 6ef5d321f..006cbdf22 100644 --- a/libpod/image/prune.go +++ b/libpod/image/prune.go @@ -4,7 +4,9 @@ import ( "context" "github.com/containers/libpod/libpod/events" + "github.com/containers/storage" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) // GetPruneImages returns a slice of images that have no names/unused @@ -44,6 +46,10 @@ func (ir *Runtime) PruneImages(ctx context.Context, all bool) ([]string, error) } for _, p := range pruneImages { if err := p.Remove(ctx, true); err != nil { + if errors.Cause(err) == storage.ErrImageUsedByContainer { + logrus.Warnf("Failed to prune image %s as it is in use: %v", p.ID(), err) + continue + } return nil, errors.Wrap(err, "failed to prune image") } defer p.newImageEvent(events.Prune) |