diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-04 15:10:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 15:10:36 -0400 |
| commit | a866a2f159f94976277d8a3a9459724af0b0f62f (patch) | |
| tree | 341b34bcd9dc87efada13a522bb21c31097fef8a /libpod/runtime_img.go | |
| parent | 2f72f17a114f4e20b56deb2c21908d1d4610919c (diff) | |
| parent | 21c9dc3c406bb486c44c4a27e5b0497bab1cd40d (diff) | |
| download | podman-a866a2f159f94976277d8a3a9459724af0b0f62f.tar.gz podman-a866a2f159f94976277d8a3a9459724af0b0f62f.tar.bz2 podman-a866a2f159f94976277d8a3a9459724af0b0f62f.zip | |
Merge pull request #11763 from rhatdan/timeout
Add --time option for podman * rm -f flag
Diffstat (limited to 'libpod/runtime_img.go')
| -rw-r--r-- | libpod/runtime_img.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 1915a5c4d..52ac0d4d7 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -37,7 +37,8 @@ func (r *Runtime) RemoveContainersForImageCallback(ctx context.Context) libimage } for _, ctr := range ctrs { if ctr.config.RootfsImageID == imageID { - if err := r.removeContainer(ctx, ctr, true, false, false); err != nil { + var timeout *uint + if err := r.removeContainer(ctx, ctr, true, false, false, timeout); err != nil { return errors.Wrapf(err, "error removing image %s: container %s using image could not be removed", imageID, ctr.ID()) } } |