Merge pull request #5944 from rhatdan/untag

Fix integration tests for untag

3 files changed, 14 insertions, 1 deletions

diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 32f7d75e5..d0b7b42b5 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -303,6 +303,10 @@ func (ir *ImageEngine) Untag(ctx context.Context, nameOrId string, tags []string
 	if err != nil {
 		return err
 	}
+	// If only one arg is provided, all names are to be untagged
+	if len(tags) == 0 {
+		tags = newImage.Names()
+	}
 	for _, tag := range tags {
 		if err := newImage.UntagImage(tag); err != nil {
 			return err
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
diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go
index 8b4b454db..17171cd41 100644
--- a/test/e2e/untag_test.go
+++ b/test/e2e/untag_test.go
@@ -16,7 +16,6 @@ var _ = Describe("Podman untag", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)