summaryrefslogtreecommitdiff
path: root/libpod/runtime_img.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-25 11:16:45 -0700
committerGitHub <noreply@github.com>2019-04-25 11:16:45 -0700
commite900e95f9aa6a22eeef9f78573dfb88df2f10d49 (patch)
treeea8137507f196ad7bdd3a080e4b4e769ce6ecae7 /libpod/runtime_img.go
parent36f479097d6617bd4a078144a8709c19f865eb8f (diff)
parent4daac4736e3476211de7c1672bb5161191666a91 (diff)
downloadpodman-e900e95f9aa6a22eeef9f78573dfb88df2f10d49.tar.gz
podman-e900e95f9aa6a22eeef9f78573dfb88df2f10d49.tar.bz2
podman-e900e95f9aa6a22eeef9f78573dfb88df2f10d49.zip
Merge pull request #2990 from nalind/image-parent-child
image: rework parent/child/history matching
Diffstat (limited to 'libpod/runtime_img.go')
-rw-r--r--libpod/runtime_img.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index 02f925fc6..5e9f65acc 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -57,7 +57,7 @@ func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool)
}
}
- hasChildren, err := img.IsParent()
+ hasChildren, err := img.IsParent(ctx)
if err != nil {
return "", err
}
@@ -82,12 +82,12 @@ func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool)
// reponames and no force is applied, we error out.
return "", fmt.Errorf("unable to delete %s (must force) - image is referred to in multiple tags", img.ID())
}
- err = img.Remove(force)
+ err = img.Remove(ctx, force)
if err != nil && errors.Cause(err) == storage.ErrImageUsedByContainer {
if errStorage := r.rmStorageContainers(force, img); errStorage == nil {
// Containers associated with the image should be deleted now,
// let's try removing the image again.
- err = img.Remove(force)
+ err = img.Remove(ctx, force)
} else {
err = errStorage
}