4 files changed, 45 insertions, 39 deletions

diff --git a/pkg/domain/infra/abi/cp.go b/pkg/domain/infra/abi/cp.go
index 9409df743..362053cce 100644
--- a/pkg/domain/infra/abi/cp.go
+++ b/pkg/domain/infra/abi/cp.go
@@ -2,46 +2,53 @@ package abi
 
 import (
 	"context"
-	"strings"
 
 	"github.com/containers/podman/v2/libpod"
 	"github.com/containers/podman/v2/pkg/copy"
 	"github.com/containers/podman/v2/pkg/domain/entities"
-	"github.com/pkg/errors"
 )
 
 func (ic *ContainerEngine) ContainerCp(ctx context.Context, source, dest string, options entities.ContainerCpOptions) error {
-	srcCtr, srcPath := parsePath(ic.Libpod, source)
-	destCtr, destPath := parsePath(ic.Libpod, dest)
-
-	if srcCtr != nil && destCtr != nil {
-		return errors.Errorf("invalid arguments %q, %q: you must use just one container", source, dest)
+	// Parse user input.
+	sourceContainerStr, sourcePath, destContainerStr, destPath, err := copy.ParseSourceAndDestination(source, dest)
+	if err != nil {
+		return err
 	}
-	if srcCtr == nil && destCtr == nil {
-		return errors.Errorf("invalid arguments %q, %q: you must specify one container", source, dest)
+
+	// Look up containers.
+	var sourceContainer, destContainer *libpod.Container
+	if len(sourceContainerStr) > 0 {
+		sourceContainer, err = ic.Libpod.LookupContainer(sourceContainerStr)
+		if err != nil {
+			return err
+		}
 	}
-	if len(srcPath) == 0 || len(destPath) == 0 {
-		return errors.Errorf("invalid arguments %q, %q: you must specify paths", source, dest)
+	if len(destContainerStr) > 0 {
+		destContainer, err = ic.Libpod.LookupContainer(destContainerStr)
+		if err != nil {
+			return err
+		}
 	}
 
 	var sourceItem, destinationItem copy.CopyItem
-	var err error
-	// Copy from the container to the host.
-	if srcCtr != nil {
-		sourceItem, err = copy.CopyItemForContainer(srcCtr, srcPath, options.Pause, true)
+
+	// Source ... container OR host.
+	if sourceContainer != nil {
+		sourceItem, err = copy.CopyItemForContainer(sourceContainer, sourcePath, options.Pause, true)
 		defer sourceItem.CleanUp()
 		if err != nil {
 			return err
 		}
 	} else {
-		sourceItem, err = copy.CopyItemForHost(srcPath, true)
+		sourceItem, err = copy.CopyItemForHost(sourcePath, true)
 		if err != nil {
 			return err
 		}
 	}
 
-	if destCtr != nil {
-		destinationItem, err = copy.CopyItemForContainer(destCtr, destPath, options.Pause, false)
+	// Destination ... container OR host.
+	if destContainer != nil {
+		destinationItem, err = copy.CopyItemForContainer(destContainer, destPath, options.Pause, false)
 		defer destinationItem.CleanUp()
 		if err != nil {
 			return err
@@ -55,22 +62,9 @@ func (ic *ContainerEngine) ContainerCp(ctx context.Context, source, dest string,
 	}
 
 	// Copy from the host to the container.
-	return copy.Copy(&sourceItem, &destinationItem, options.Extract)
-}
-
-func parsePath(runtime *libpod.Runtime, path string) (*libpod.Container, string) {
-	if len(path) == 0 {
-		return nil, ""
-	}
-	if path[0] == '.' || path[0] == '/' { // A path cannot point to a container.
-		return nil, path
-	}
-	pathArr := strings.SplitN(path, ":", 2)
-	if len(pathArr) == 2 {
-		ctr, err := runtime.LookupContainer(pathArr[0])
-		if err == nil {
-			return ctr, pathArr[1]
-		}
+	copier, err := copy.GetCopier(&sourceItem, &destinationItem, options.Extract)
+	if err != nil {
+		return err
 	}
-	return nil, path
+	return copier.Copy()
 }
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index ad7128b42..600d64b1d 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -54,7 +54,7 @@ func (ir *ImageEngine) ManifestInspect(ctx context.Context, name string) ([]byte
 			}
 			return buf, nil
 			// no return if local image is not a list of images type
-			// continue on getting valid manifest through remote serice
+			// continue on getting valid manifest through remote service
 		} else if errors.Cause(err) != buildahManifests.ErrManifestTypeNotSupported {
 			return nil, errors.Wrapf(err, "loading manifest %q", name)
 		}
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 3aeb6a2ee..5b983a3f4 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -212,8 +212,10 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
 			return nil, errors.Wrapf(err, "Failed to parse image %q", container.Image)
 		}
 		// In kube, if the image is tagged with latest, it should always pull
+		// but if the domain is localhost, that means the image was built locally
+		// so do not attempt a pull.
 		if tagged, isTagged := named.(reference.NamedTagged); isTagged {
-			if tagged.Tag() == image.LatestTag {
+			if tagged.Tag() == image.LatestTag && reference.Domain(named) != image.DefaultLocalRegistry {
 				pullPolicy = util.PullImageAlways
 			}
 		}
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index 7ed58092b..d6881fdc4 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -179,7 +180,16 @@ func (ic *ContainerEngine) SystemPrune(ctx context.Context, options entities.Sys
 			found = true
 		}
 		systemPruneReport.PodPruneReport = append(systemPruneReport.PodPruneReport, podPruneReport...)
-		containerPruneReport, err := ic.pruneContainersHelper(nil)
+		containerPruneOptions := entities.ContainerPruneOptions{}
+		for _, f := range options.Filter {
+			t := strings.SplitN(f, "=", 2)
+			containerPruneOptions.Filters = make(url.Values)
+			if len(t) < 2 {
+				return nil, errors.Errorf("filter input must be in the form of filter=value: %s is invalid", f)
+			}
+			containerPruneOptions.Filters.Add(t[0], t[1])
+		}
+		containerPruneReport, err := ic.ContainerPrune(ctx, containerPruneOptions)
 		if err != nil {
 			return nil, err
 		}
@@ -194,7 +204,7 @@ func (ic *ContainerEngine) SystemPrune(ctx context.Context, options entities.Sys
 			}
 		}
 
-		results, err := ic.Libpod.ImageRuntime().PruneImages(ctx, options.All, nil)
+		results, err := ic.Libpod.ImageRuntime().PruneImages(ctx, options.All, options.Filter)
 
 		if err != nil {
 			return nil, err