4 files changed, 82 insertions, 0 deletions
diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go
index cdb8d7f0d..6547cbfaf 100644
--- a/pkg/domain/entities/engine_image.go
+++ b/pkg/domain/entities/engine_image.go
@@ -11,4 +11,6 @@ type ImageEngine interface {
 	List(ctx context.Context, opts ImageListOptions) ([]*ImageSummary, error)
 	Prune(ctx context.Context, opts ImagePruneOptions) (*ImagePruneReport, error)
 	Pull(ctx context.Context, rawImage string, opts ImagePullOptions) (*ImagePullReport, error)
+	Tag(ctx context.Context, nameOrId string, tags []string, options ImageTagOptions) error
+	Untag(ctx context.Context, nameOrId string, tags []string, options ImageUntagOptions) error
 }
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index 8e3f49be3..41579398b 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -171,3 +171,6 @@ type ImagePruneReport struct {
 	Report Report
 	Size   int64
 }
+
+type ImageTagOptions struct{}
+type ImageUntagOptions struct{}
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index ef2879246..38b6c151d 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -264,3 +264,28 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 // 	copy(report.Report.Id, id)
 // 	return &report, nil
 // }
+
+func (ir *ImageEngine) Tag(ctx context.Context, nameOrId string, tags []string, options entities.ImageTagOptions) error {
+	newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(nameOrId)
+	if err != nil {
+		return err
+	}
+	for _, tag := range tags {
+		if err := newImage.TagImage(tag); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+func (ir *ImageEngine) Untag(ctx context.Context, nameOrId string, tags []string, options entities.ImageUntagOptions) error {
+	newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(nameOrId)
+	if err != nil {
+		return err
+	}
+	for _, tag := range tags {
+		if err := newImage.UntagImage(tag); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 7638d908a..d7f281243 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -3,9 +3,11 @@ package tunnel
 import (
 	"context"
 
+	"github.com/containers/image/v5/docker/reference"
 	images "github.com/containers/libpod/pkg/bindings/images"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/domain/utils"
+	"github.com/pkg/errors"
 )
 
 func (ir *ImageEngine) Exists(_ context.Context, nameOrId string) (*entities.BoolReport, error) {
@@ -93,3 +95,53 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 	}
 	return &entities.ImagePullReport{Images: pulledImages}, nil
 }
+
+func (ir *ImageEngine) Tag(ctx context.Context, nameOrId string, tags []string, options entities.ImageTagOptions) error {
+	for _, newTag := range tags {
+		var (
+			tag, repo string
+		)
+		ref, err := reference.Parse(newTag)
+		if err != nil {
+			return err
+		}
+		if t, ok := ref.(reference.Tagged); ok {
+			tag = t.Tag()
+		}
+		if r, ok := ref.(reference.Named); ok {
+			repo = r.Name()
+		}
+		if len(repo) < 1 {
+			return errors.Errorf("invalid image name %q", nameOrId)
+		}
+		if err := images.Tag(ir.ClientCxt, nameOrId, tag, repo); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (ir *ImageEngine) Untag(ctx context.Context, nameOrId string, tags []string, options entities.ImageUntagOptions) error {
+	for _, newTag := range tags {
+		var (
+			tag, repo string
+		)
+		ref, err := reference.Parse(newTag)
+		if err != nil {
+			return err
+		}
+		if t, ok := ref.(reference.Tagged); ok {
+			tag = t.Tag()
+		}
+		if r, ok := ref.(reference.Named); ok {
+			repo = r.Name()
+		}
+		if len(repo) < 1 {
+			return errors.Errorf("invalid image name %q", nameOrId)
+		}
+		if err := images.Untag(ir.ClientCxt, nameOrId, tag, repo); err != nil {
+			return err
+		}
+	}
+	return nil
+}