1 files changed, 182 insertions, 19 deletions
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 60df40498..516914a68 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -2,34 +2,41 @@ package tunnel
 
 import (
 	"context"
-	"net/url"
+	"io/ioutil"
+	"os"
 
+	"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"
+	utils2 "github.com/containers/libpod/utils"
+	"github.com/pkg/errors"
 )
 
-func (ir *ImageEngine) Delete(ctx context.Context, nameOrId string, opts entities.ImageDeleteOptions) (*entities.ImageDeleteReport, error) {
-	results, err := images.Remove(ir.ClientCxt, nameOrId, &opts.Force)
-	if err != nil {
-		return nil, err
-	}
+func (ir *ImageEngine) Exists(_ context.Context, nameOrId string) (*entities.BoolReport, error) {
+	found, err := images.Exists(ir.ClientCxt, nameOrId)
+	return &entities.BoolReport{Value: found}, err
+}
 
-	report := entities.ImageDeleteReport{
-		Untagged: nil,
-		Deleted:  "",
-	}
+func (ir *ImageEngine) Delete(ctx context.Context, nameOrId []string, opts entities.ImageDeleteOptions) (*entities.ImageDeleteReport, error) {
+	report := entities.ImageDeleteReport{}
 
-	for _, e := range results {
-		if a, ok := e["Deleted"]; ok {
-			report.Deleted = a
+	for _, id := range nameOrId {
+		results, err := images.Remove(ir.ClientCxt, id, &opts.Force)
+		if err != nil {
+			return nil, err
 		}
+		for _, e := range results {
+			if a, ok := e["Deleted"]; ok {
+				report.Deleted = append(report.Deleted, a)
+			}
 
-		if a, ok := e["Untagged"]; ok {
-			report.Untagged = append(report.Untagged, a)
+			if a, ok := e["Untagged"]; ok {
+				report.Untagged = append(report.Untagged, a)
+			}
 		}
 	}
-	return &report, err
+	return &report, nil
 }
 
 func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) {
@@ -69,12 +76,168 @@ func (ir *ImageEngine) History(ctx context.Context, nameOrId string, opts entiti
 }
 
 func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOptions) (*entities.ImagePruneReport, error) {
-	results, err := images.Prune(ir.ClientCxt, url.Values{})
+	results, err := images.Prune(ir.ClientCxt, &opts.All, opts.Filters)
+	if err != nil {
+		return nil, err
+	}
+
+	report := entities.ImagePruneReport{
+		Report: entities.Report{
+			Id:  results,
+			Err: nil,
+		},
+		Size: 0,
+	}
+	return &report, nil
+}
+
+func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entities.ImagePullOptions) (*entities.ImagePullReport, error) {
+	pulledImages, err := images.Pull(ir.ClientCxt, rawImage, options)
 	if err != nil {
 		return nil, err
 	}
+	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
+}
 
-	report := entities.ImagePruneReport{}
-	copy(report.Report.Id, results)
+func (ir *ImageEngine) Inspect(_ context.Context, names []string, opts entities.InspectOptions) (*entities.ImageInspectReport, error) {
+	report := entities.ImageInspectReport{}
+	for _, id := range names {
+		r, err := images.GetImage(ir.ClientCxt, id, &opts.Size)
+		if err != nil {
+			report.Errors[id] = err
+		}
+		report.Images = append(report.Images, r)
+	}
 	return &report, nil
 }
+
+func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions) (*entities.ImageLoadReport, error) {
+	f, err := os.Open(opts.Input)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+	return images.Load(ir.ClientCxt, f, &opts.Name)
+}
+
+func (ir *ImageEngine) Import(ctx context.Context, opts entities.ImageImportOptions) (*entities.ImageImportReport, error) {
+	var (
+		err       error
+		sourceURL *string
+		f         *os.File
+	)
+	if opts.SourceIsURL {
+		sourceURL = &opts.Source
+	} else {
+		f, err = os.Open(opts.Source)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return images.Import(ir.ClientCxt, opts.Changes, &opts.Message, &opts.Reference, sourceURL, f)
+}
+
+func (ir *ImageEngine) Push(ctx context.Context, source string, destination string, options entities.ImagePushOptions) error {
+	return images.Push(ir.ClientCxt, source, destination, options)
+}
+
+func (ir *ImageEngine) Save(ctx context.Context, nameOrId string, tags []string, options entities.ImageSaveOptions) error {
+	var (
+		f   *os.File
+		err error
+	)
+
+	switch options.Format {
+	case "oci-dir", "docker-dir":
+		f, err = ioutil.TempFile("", "podman_save")
+		if err == nil {
+			defer func() { _ = os.Remove(f.Name()) }()
+		}
+	default:
+		f, err = os.Create(options.Output)
+	}
+	if err != nil {
+		return err
+	}
+
+	exErr := images.Export(ir.ClientCxt, nameOrId, f, &options.Format, &options.Compress)
+	if err := f.Close(); err != nil {
+		return err
+	}
+	if exErr != nil {
+		return exErr
+	}
+
+	if options.Format != "oci-dir" && options.Format != "docker-dir" {
+		return nil
+	}
+
+	f, err = os.Open(f.Name())
+	if err != nil {
+		return err
+	}
+	info, err := os.Stat(options.Output)
+	switch {
+	case err == nil:
+		if info.Mode().IsRegular() {
+			return errors.Errorf("%q already exists as a regular file", options.Output)
+		}
+	case os.IsNotExist(err):
+		if err := os.Mkdir(options.Output, 0755); err != nil {
+			return err
+		}
+	default:
+		return err
+	}
+	return utils2.UntarToFileSystem(options.Output, f, nil)
+}