diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-23 18:01:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-23 18:01:32 +0100 |
| commit | d62fce0c873bdd1341af15eba4418ff83af7edba (patch) | |
| tree | 9c4f9b09f18ffb47ecc50b6b5058e64c390ec57d /pkg/adapter/runtime_remote.go | |
| parent | d43bff7cc6484927487ded4246e7625c8b42b5e8 (diff) | |
| parent | 4f09cfdaccfdd0f1deb01e52c7e1b18a9cec7d49 (diff) | |
| download | podman-d62fce0c873bdd1341af15eba4418ff83af7edba.tar.gz podman-d62fce0c873bdd1341af15eba4418ff83af7edba.tar.bz2 podman-d62fce0c873bdd1341af15eba4418ff83af7edba.zip | |
Merge pull request #4743 from baude/imageresponse
add struct response for removal of images
Diffstat (limited to 'pkg/adapter/runtime_remote.go')
| -rw-r--r-- | pkg/adapter/runtime_remote.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go index 87b4999ce..fe5cc4fef 100644 --- a/pkg/adapter/runtime_remote.go +++ b/pkg/adapter/runtime_remote.go @@ -414,8 +414,15 @@ func (ci *ContainerImage) TagImage(tag string) error { } // RemoveImage calls varlink to remove an image -func (r *LocalRuntime) RemoveImage(ctx context.Context, img *ContainerImage, force bool) (string, error) { - return iopodman.RemoveImage().Call(r.Conn, img.InputName, force) +func (r *LocalRuntime) RemoveImage(ctx context.Context, img *ContainerImage, force bool) (*image.ImageDeleteResponse, error) { + ir := image.ImageDeleteResponse{} + response, err := iopodman.RemoveImageWithResponse().Call(r.Conn, img.InputName, force) + if err != nil { + return nil, err + } + ir.Deleted = response.Deleted + ir.Untagged = append(ir.Untagged, response.Untagged...) + return &ir, nil } // History returns the history of an image and its layers |