diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-22 21:23:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 21:23:42 +0200 |
| commit | cac05c85887accb71763f7b21a189a14426f4cb4 (patch) | |
| tree | 0830469afe2c70bf6658278ba4f391bc41be7159 /pkg/domain/infra/tunnel/images.go | |
| parent | 9a910efcf65aa277ccf558e76fd0ead96559eb11 (diff) | |
| parent | 6fdcc09a2027d9c929af0389fba131c72b103fcd (diff) | |
| download | podman-cac05c85887accb71763f7b21a189a14426f4cb4.tar.gz podman-cac05c85887accb71763f7b21a189a14426f4cb4.tar.bz2 podman-cac05c85887accb71763f7b21a189a14426f4cb4.zip | |
Merge pull request #5944 from rhatdan/untag
Fix integration tests for untag
Diffstat (limited to 'pkg/domain/infra/tunnel/images.go')
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 822842936..27ed9f1ec 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -7,6 +7,7 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" + "github.com/containers/libpod/pkg/bindings" images "github.com/containers/libpod/pkg/bindings/images" "github.com/containers/libpod/pkg/domain/entities" "github.com/containers/libpod/pkg/domain/utils" @@ -109,6 +110,15 @@ 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 + } + for _, newTag := range tags { var ( tag, repo string |