diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-30 12:58:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 12:58:08 +0000 |
| commit | 4d57313449a7f7c86697ad830816f5c1e73c05ca (patch) | |
| tree | 35f0fdefb681068d2af2e3fac7f43e16df650d2a /pkg/domain/infra | |
| parent | 451f003ce95c07fc8212daa8eab54cfcbd754093 (diff) | |
| parent | 1a3e4094125f22a8e121e5208d61167078635148 (diff) | |
| download | podman-4d57313449a7f7c86697ad830816f5c1e73c05ca.tar.gz podman-4d57313449a7f7c86697ad830816f5c1e73c05ca.tar.bz2 podman-4d57313449a7f7c86697ad830816f5c1e73c05ca.zip | |
Merge pull request #7840 from vrothberg/remote-untag
fix remote untag
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 981884109..61ac2141c 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -9,7 +9,6 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" - "github.com/containers/podman/v2/pkg/bindings" images "github.com/containers/podman/v2/pkg/bindings/images" "github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/podman/v2/pkg/domain/utils" @@ -139,13 +138,8 @@ func (ir *ImageEngine) Tag(ctx context.Context, nameOrID string, tags []string, } func (ir *ImageEngine) Untag(ctx context.Context, nameOrID string, tags []string, options entities.ImageUntagOptions) error { - // Remove all tags if none are provided if len(tags) == 0 { - newImage, err := images.GetImage(ir.ClientCxt, nameOrID, bindings.PFalse) - if err != nil { - return err - } - tags = newImage.NamesHistory + return images.Untag(ir.ClientCxt, nameOrID, "", "") } for _, newTag := range tags { |