6 files changed, 47 insertions, 38 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index f3aff1d49..46feae90d 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -12,7 +12,7 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/libpod/pkg/sysinfo"
-	"github.com/fatih/camelcase"
+	"github.com/containers/libpod/pkg/util/camelcase"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 75cdd3465..115f30d9b 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -159,6 +159,21 @@ func imagesCmd(c *cliconfig.ImagesValues) error {
 		filters = append(filters, fmt.Sprintf("reference=%s", image))
 	}
 
+	var sortValues = map[string]bool{
+		"created":    true,
+		"id":         true,
+		"repository": true,
+		"size":       true,
+		"tag":        true,
+	}
+	if !sortValues[c.Sort] {
+		keys := make([]string, 0, len(sortValues))
+		for k := range sortValues {
+			keys = append(keys, k)
+		}
+		return errors.Errorf("invalid sort value %q,  required values: %s", c.Sort, strings.Join(keys, ", "))
+	}
+
 	opts := imagesOptions{
 		quiet:     c.Quiet,
 		noHeading: c.Noheading,
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go
index c6baf6b61..1cbb3f45e 100644
--- a/cmd/podman/pull.go
+++ b/cmd/podman/pull.go
@@ -55,7 +55,6 @@ func init() {
 	flags.StringVar(&pullCommand.Creds, "creds", "", "`Credentials` (USERNAME:PASSWORD) to use for authenticating to a registry")
 	flags.BoolVarP(&pullCommand.Quiet, "quiet", "q", false, "Suppress output information when pulling images")
 	flags.StringVar(&pullCommand.OverrideArch, "override-arch", "", "use `ARCH` instead of the architecture of the machine for choosing images")
-	markFlagHidden(flags, "override-arch")
 	flags.StringVar(&pullCommand.OverrideOS, "override-os", "", "use `OS` instead of the running OS for choosing images")
 	markFlagHidden(flags, "override-os")
 	// Disabled flags for the remote client
diff --git a/cmd/podman/push.go b/cmd/podman/push.go
index 1be8dfe11..b078959ba 100644
--- a/cmd/podman/push.go
+++ b/cmd/podman/push.go
@@ -100,7 +100,8 @@ func pushCmd(c *cliconfig.PushValues) error {
 
 	// --compress and --format can only be used for the "dir" transport
 	splitArg := strings.SplitN(destName, ":", 2)
-	if c.Flag("compress").Changed || c.Flag("format").Changed {
+
+	if c.IsSet("compress") || c.Flag("format").Changed {
 		if splitArg[0] != directory.Transport.Name() {
 			return errors.Errorf("--compress and --format can be set only when pushing to a directory using the 'dir' transport")
 		}
@@ -141,7 +142,7 @@ func pushCmd(c *cliconfig.PushValues) error {
 		DockerRegistryCreds: registryCreds,
 		DockerCertPath:      certPath,
 	}
-	if c.Flag("tls-verify").Changed {
+	if c.IsSet("tls-verify") {
 		dockerRegistryOptions.DockerInsecureSkipTLSVerify = types.NewOptionalBool(!c.TlsVerify)
 	}
 
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 15d6bddbb..2f637694b 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -31,9 +31,9 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// seccompAnnotationKey is the key of the image annotation embedding a seccomp
+// seccompLabelKey is the key of the image annotation embedding a seccomp
 // profile.
-const seccompAnnotationKey = "io.containers.seccomp.profile"
+const seccompLabelKey = "io.containers.seccomp.profile"
 
 func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.Runtime) (*libpod.Container, *cc.CreateConfig, error) {
 	var (
@@ -709,7 +709,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 
 	// SECCOMP
 	if data != nil {
-		if value, exists := data.Annotations[seccompAnnotationKey]; exists {
+		if value, exists := labels[seccompLabelKey]; exists {
 			secConfig.SeccompProfileFromImage = value
 		}
 	}
diff --git a/cmd/podman/shared/pod.go b/cmd/podman/shared/pod.go
index d8d69c8fc..7b0b497fc 100644
--- a/cmd/podman/shared/pod.go
+++ b/cmd/podman/shared/pod.go
@@ -10,14 +10,8 @@ import (
 	"github.com/pkg/errors"
 )
 
-const (
-	PodStateStopped = "Stopped"
-	PodStateRunning = "Running"
-	PodStatePaused  = "Paused"
-	PodStateExited  = "Exited"
-	PodStateErrored = "Error"
-	PodStateCreated = "Created"
-)
+// TODO GetPodStatus and CreatePodStatusResults should removed once the adapter
+// and shared packages are reworked.  It has now been duplicated in libpod proper.
 
 // GetPodStatus determines the status of the pod based on the
 // statuses of the containers in the pod.
@@ -25,7 +19,7 @@ const (
 func GetPodStatus(pod *libpod.Pod) (string, error) {
 	ctrStatuses, err := pod.Status()
 	if err != nil {
-		return PodStateErrored, err
+		return define.PodStateErrored, err
 	}
 	return CreatePodStatusResults(ctrStatuses)
 }
@@ -33,45 +27,45 @@ func GetPodStatus(pod *libpod.Pod) (string, error) {
 func CreatePodStatusResults(ctrStatuses map[string]define.ContainerStatus) (string, error) {
 	ctrNum := len(ctrStatuses)
 	if ctrNum == 0 {
-		return PodStateCreated, nil
+		return define.PodStateCreated, nil
 	}
 	statuses := map[string]int{
-		PodStateStopped: 0,
-		PodStateRunning: 0,
-		PodStatePaused:  0,
-		PodStateCreated: 0,
-		PodStateErrored: 0,
+		define.PodStateStopped: 0,
+		define.PodStateRunning: 0,
+		define.PodStatePaused:  0,
+		define.PodStateCreated: 0,
+		define.PodStateErrored: 0,
 	}
 	for _, ctrStatus := range ctrStatuses {
 		switch ctrStatus {
 		case define.ContainerStateExited:
 			fallthrough
 		case define.ContainerStateStopped:
-			statuses[PodStateStopped]++
+			statuses[define.PodStateStopped]++
 		case define.ContainerStateRunning:
-			statuses[PodStateRunning]++
+			statuses[define.PodStateRunning]++
 		case define.ContainerStatePaused:
-			statuses[PodStatePaused]++
+			statuses[define.PodStatePaused]++
 		case define.ContainerStateCreated, define.ContainerStateConfigured:
-			statuses[PodStateCreated]++
+			statuses[define.PodStateCreated]++
 		default:
-			statuses[PodStateErrored]++
+			statuses[define.PodStateErrored]++
 		}
 	}
 
 	switch {
-	case statuses[PodStateRunning] > 0:
-		return PodStateRunning, nil
-	case statuses[PodStatePaused] == ctrNum:
-		return PodStatePaused, nil
-	case statuses[PodStateStopped] == ctrNum:
-		return PodStateExited, nil
-	case statuses[PodStateStopped] > 0:
-		return PodStateStopped, nil
-	case statuses[PodStateErrored] > 0:
-		return PodStateErrored, nil
+	case statuses[define.PodStateRunning] > 0:
+		return define.PodStateRunning, nil
+	case statuses[define.PodStatePaused] == ctrNum:
+		return define.PodStatePaused, nil
+	case statuses[define.PodStateStopped] == ctrNum:
+		return define.PodStateExited, nil
+	case statuses[define.PodStateStopped] > 0:
+		return define.PodStateStopped, nil
+	case statuses[define.PodStateErrored] > 0:
+		return define.PodStateErrored, nil
 	default:
-		return PodStateCreated, nil
+		return define.PodStateCreated, nil
 	}
 }