4 files changed, 267 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index d25af24c5..d4c5ac311 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -243,7 +243,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
 	return reports, nil
 }
 
-func (ic *ContainerEngine) ContainerInspect(ctx context.Context, namesOrIds []string, options entities.ContainerInspectOptions) ([]*entities.ContainerInspectReport, error) {
+func (ic *ContainerEngine) ContainerInspect(ctx context.Context, namesOrIds []string, options entities.InspectOptions) ([]*entities.ContainerInspectReport, error) {
 	var reports []*entities.ContainerInspectReport
 	ctrs, err := shortcuts.GetContainersByContext(false, options.Latest, namesOrIds, ic.Libpod)
 	if err != nil {
@@ -325,3 +325,11 @@ func (ic *ContainerEngine) ContainerCommit(ctx context.Context, nameOrId string,
 	}
 	return &entities.CommitReport{Id: newImage.ID()}, nil
 }
+
+func (ic *ContainerEngine) ContainerExport(ctx context.Context, nameOrId string, options entities.ContainerExportOptions) error {
+	ctr, err := ic.Libpod.LookupContainer(nameOrId)
+	if err != nil {
+		return err
+	}
+	return ctr.Export(options.Output)
+}
diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go
new file mode 100644
index 000000000..699483243
--- /dev/null
+++ b/pkg/domain/infra/abi/healthcheck.go
@@ -0,0 +1,26 @@
+// +build ABISupport
+
+package abi
+
+import (
+	"context"
+
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/domain/entities"
+)
+
+func (ic *ContainerEngine) HealthCheckRun(ctx context.Context, nameOrId string, options entities.HealthCheckOptions) (*define.HealthCheckResults, error) {
+	status, err := ic.Libpod.HealthCheck(nameOrId)
+	if err != nil {
+		return nil, err
+	}
+	hcStatus := "unhealthy"
+	if status == libpod.HealthCheckSuccess {
+		hcStatus = "healthy"
+	}
+	report := define.HealthCheckResults{
+		Status: hcStatus,
+	}
+	return &report, nil
+}
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 44420c1e1..c3a2bb288 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -5,11 +5,23 @@ package abi
 import (
 	"context"
 	"fmt"
+	"io"
+	"os"
+	"strings"
 
+	"github.com/containers/image/v5/docker"
+	dockerarchive "github.com/containers/image/v5/docker/archive"
+	"github.com/containers/image/v5/docker/reference"
+	"github.com/containers/image/v5/transports/alltransports"
+	"github.com/containers/image/v5/types"
+	"github.com/containers/libpod/libpod/image"
 	libpodImage "github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/pkg/domain/entities"
+	domainUtils "github.com/containers/libpod/pkg/domain/utils"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 func (ir *ImageEngine) Exists(_ context.Context, nameOrId string) (*entities.BoolReport, error) {
@@ -134,6 +146,120 @@ func ToDomainHistoryLayer(layer *libpodImage.History) entities.ImageHistoryLayer
 	return l
 }
 
+func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entities.ImagePullOptions) (*entities.ImagePullReport, error) {
+	var writer io.Writer
+	if !options.Quiet {
+		writer = os.Stderr
+	}
+
+	dockerPrefix := fmt.Sprintf("%s://", docker.Transport.Name())
+	imageRef, err := alltransports.ParseImageName(rawImage)
+	if err != nil {
+		imageRef, err = alltransports.ParseImageName(fmt.Sprintf("%s%s", dockerPrefix, rawImage))
+		if err != nil {
+			return nil, errors.Errorf("invalid image reference %q", rawImage)
+		}
+	}
+
+	// Special-case for docker-archive which allows multiple tags.
+	if imageRef.Transport().Name() == dockerarchive.Transport.Name() {
+		newImage, err := ir.Libpod.ImageRuntime().LoadFromArchiveReference(ctx, imageRef, options.SignaturePolicy, writer)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error pulling image %q", rawImage)
+		}
+		return &entities.ImagePullReport{Images: []string{newImage[0].ID()}}, nil
+	}
+
+	var registryCreds *types.DockerAuthConfig
+	if options.Credentials != "" {
+		creds, err := util.ParseRegistryCreds(options.Credentials)
+		if err != nil {
+			return nil, err
+		}
+		registryCreds = creds
+	}
+	dockerRegistryOptions := image.DockerRegistryOptions{
+		DockerRegistryCreds:         registryCreds,
+		DockerCertPath:              options.CertDir,
+		OSChoice:                    options.OverrideOS,
+		ArchitectureChoice:          options.OverrideArch,
+		DockerInsecureSkipTLSVerify: options.TLSVerify,
+	}
+
+	if !options.AllTags {
+		newImage, err := ir.Libpod.ImageRuntime().New(ctx, rawImage, options.SignaturePolicy, options.Authfile, writer, &dockerRegistryOptions, image.SigningOptions{}, nil, util.PullImageAlways)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error pulling image %q", rawImage)
+		}
+		return &entities.ImagePullReport{Images: []string{newImage.ID()}}, nil
+	}
+
+	// --all-tags requires the docker transport
+	if imageRef.Transport().Name() != docker.Transport.Name() {
+		return nil, errors.New("--all-tags requires docker transport")
+	}
+
+	// Trim the docker-transport prefix.
+	rawImage = strings.TrimPrefix(rawImage, docker.Transport.Name())
+
+	// all-tags doesn't work with a tagged reference, so let's check early
+	namedRef, err := reference.Parse(rawImage)
+	if err != nil {
+		return nil, errors.Wrapf(err, "error parsing %q", rawImage)
+	}
+	if _, isTagged := namedRef.(reference.Tagged); isTagged {
+		return nil, errors.New("--all-tags requires a reference without a tag")
+
+	}
+
+	systemContext := image.GetSystemContext("", options.Authfile, false)
+	tags, err := docker.GetRepositoryTags(ctx, systemContext, imageRef)
+	if err != nil {
+		return nil, errors.Wrapf(err, "error getting repository tags")
+	}
+
+	var foundIDs []string
+	for _, tag := range tags {
+		name := rawImage + ":" + tag
+		newImage, err := ir.Libpod.ImageRuntime().New(ctx, name, options.SignaturePolicy, options.Authfile, writer, &dockerRegistryOptions, image.SigningOptions{}, nil, util.PullImageAlways)
+		if err != nil {
+			logrus.Errorf("error pulling image %q", name)
+			continue
+		}
+		foundIDs = append(foundIDs, newImage.ID())
+	}
+
+	if len(tags) != len(foundIDs) {
+		return nil, errors.Errorf("error pulling image %q", rawImage)
+	}
+	return &entities.ImagePullReport{Images: foundIDs}, nil
+}
+
+func (ir *ImageEngine) Inspect(ctx context.Context, names []string, opts entities.InspectOptions) (*entities.ImageInspectReport, error) {
+	report := entities.ImageInspectReport{
+		Errors: make(map[string]error),
+	}
+
+	for _, id := range names {
+		img, err := ir.Libpod.ImageRuntime().NewFromLocal(id)
+		if err != nil {
+			report.Errors[id] = err
+			continue
+		}
+
+		results, err := img.Inspect(ctx)
+		if err != nil {
+			report.Errors[id] = err
+			continue
+		}
+
+		cookedResults := entities.ImageData{}
+		_ = domainUtils.DeepCopy(&cookedResults, results)
+		report.Images = append(report.Images, &cookedResults)
+	}
+	return &report, nil
+}
+
 // func (r *imageRuntime) Delete(ctx context.Context, nameOrId string, opts entities.ImageDeleteOptions) (*entities.ImageDeleteReport, error) {
 // 	image, err := r.libpod.ImageEngine().NewFromLocal(nameOrId)
 // 	if err != nil {
@@ -146,7 +272,7 @@ func ToDomainHistoryLayer(layer *libpodImage.History) entities.ImageHistoryLayer
 // 	}
 //
 // 	report := entities.ImageDeleteReport{}
-// 	if err := utils.DeepCopy(&report, results); err != nil {
+// 	if err := domainUtils.DeepCopy(&report, results); err != nil {
 // 		return nil, err
 // 	}
 // 	return &report, nil
@@ -164,3 +290,49 @@ func ToDomainHistoryLayer(layer *libpodImage.History) entities.ImageHistoryLayer
 // 	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
+}
+
+func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions) (*entities.ImageLoadReport, error) {
+	var (
+		writer io.Writer
+	)
+	if !opts.Quiet {
+		writer = os.Stderr
+	}
+	name, err := ir.Libpod.LoadImage(ctx, opts.Name, opts.Input, writer, opts.SignaturePolicy)
+	if err != nil {
+		return nil, err
+	}
+	newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(name)
+	if err != nil {
+		return nil, errors.Wrap(err, "image loaded but no additional tags were created")
+	}
+	if err := newImage.TagImage(opts.Name); err != nil {
+		return nil, errors.Wrapf(err, "error adding %q to image %q", opts.Name, newImage.InputName)
+	}
+	return &entities.ImageLoadReport{Name: name}, nil
+}
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index 8abcc6e4b..494a048ec 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/libpod/podfilters"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/signal"
 	"github.com/containers/libpod/pkg/specgen"
@@ -272,3 +273,61 @@ func (ic *ContainerEngine) PodTop(ctx context.Context, options entities.PodTopOp
 	report.Value, err = pod.GetPodPidInformation(options.Descriptors)
 	return report, err
 }
+
+func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOptions) ([]*entities.ListPodsReport, error) {
+	var (
+		filters []libpod.PodFilter
+		reports []*entities.ListPodsReport
+	)
+	for k, v := range options.Filters {
+		for _, filter := range v {
+			f, err := podfilters.GeneratePodFilterFunc(k, filter)
+			if err != nil {
+				return nil, err
+			}
+			filters = append(filters, f)
+
+		}
+	}
+	pds, err := ic.Libpod.Pods(filters...)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pds {
+		var lpcs []*entities.ListPodContainer
+		status, err := p.GetPodStatus()
+		if err != nil {
+			return nil, err
+		}
+		cons, err := p.AllContainers()
+		if err != nil {
+			return nil, err
+		}
+		for _, c := range cons {
+			state, err := c.State()
+			if err != nil {
+				return nil, err
+			}
+			lpcs = append(lpcs, &entities.ListPodContainer{
+				Id:     c.ID(),
+				Names:  c.Name(),
+				Status: state.String(),
+			})
+		}
+		infraId, err := p.InfraContainerID()
+		if err != nil {
+			return nil, err
+		}
+		reports = append(reports, &entities.ListPodsReport{
+			Cgroup:     p.CgroupParent(),
+			Containers: lpcs,
+			Created:    p.CreatedTime(),
+			Id:         p.ID(),
+			InfraId:    infraId,
+			Name:       p.Name(),
+			Namespace:  p.Namespace(),
+			Status:     status,
+		})
+	}
+	return reports, nil
+}