diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-07 11:40:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 11:40:10 -0400 |
| commit | 1a9cb93f16cf19e14581319e2fd1b60e791f74dd (patch) | |
| tree | 491b374d826265b9c9d6079f79d1a4df049452e6 | |
| parent | c583d4dd8c34bab1d5c72123aa3914b1269cb57b (diff) | |
| parent | 38bef70b30cc8c55e05353aeef4aea2acf4f4eb0 (diff) | |
| download | podman-1a9cb93f16cf19e14581319e2fd1b60e791f74dd.tar.gz podman-1a9cb93f16cf19e14581319e2fd1b60e791f74dd.tar.bz2 podman-1a9cb93f16cf19e14581319e2fd1b60e791f74dd.zip | |
Merge pull request #10870 from vrothberg/manifest-push-rm
manifest push --rm: use libimage for removal
| -rw-r--r-- | pkg/domain/infra/abi/manifest.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index 7e5477f4f..e905036be 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -355,8 +355,8 @@ func (ir *ImageEngine) ManifestPush(ctx context.Context, name, destination strin } if opts.Rm { - if _, err := ir.Libpod.GetStore().DeleteImage(manifestList.ID(), true); err != nil { - return "", errors.Wrap(err, "error removing manifest after push") + if _, rmErrors := ir.Libpod.LibimageRuntime().RemoveImages(ctx, []string{manifestList.ID()}, nil); len(rmErrors) > 0 { + return "", errors.Wrap(rmErrors[0], "error removing manifest after push") } } |