4 files changed, 6 insertions, 35 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 4b0641d82..14451d944 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -17,7 +17,6 @@ func getMainCommands() []*cobra.Command {
 		_loginCommand,
 		_logoutCommand,
 		_mountCommand,
-		_portCommand,
 		_refreshCommand,
 		_searchCommand,
 		_statsCommand,
@@ -45,7 +44,6 @@ func getContainerSubCommands() []*cobra.Command {
 		_commitCommand,
 		_execCommand,
 		_mountCommand,
-		_portCommand,
 		_refreshCommand,
 		_restoreCommand,
 		_runlabelCommand,
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index b3058bf12..6a3badc41 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -60,8 +60,9 @@ var (
 		_listSubCommand,
 		_logsCommand,
 		_pauseCommand,
-		_restartCommand,
+		_portCommand,
 		_pruneContainersCommand,
+		_restartCommand,
 		_runCommand,
 		_rmCommand,
 		_startCommand,
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index f501ee674..d2ae6a73a 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -45,6 +45,7 @@ var mainCommands = []*cobra.Command{
 	_logsCommand,
 	_pauseCommand,
 	podCommand.Command,
+	_portCommand,
 	&_psCommand,
 	_pullCommand,
 	_pushCommand,
diff --git a/cmd/podman/port.go b/cmd/podman/port.go
index 7a9f01fe6..1bd2d623e 100644
--- a/cmd/podman/port.go
+++ b/cmd/podman/port.go
@@ -6,8 +6,7 @@ import (
 	"strings"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
-	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -51,10 +50,7 @@ func portCmd(c *cliconfig.PortValues) error {
 	var (
 		userProto, containerName string
 		userPort                 int
-		container                *libpod.Container
-		containers               []*libpod.Container
 	)
-
 	args := c.InputArgs
 
 	if c.Latest && c.All {
@@ -66,9 +62,6 @@ func portCmd(c *cliconfig.PortValues) error {
 	if len(args) == 0 && !c.Latest && !c.All {
 		return errors.Errorf("you must supply a running container name or id")
 	}
-	if !c.Latest && !c.All {
-		containerName = args[0]
-	}
 
 	port := ""
 	if len(args) > 1 && !c.Latest {
@@ -98,36 +91,14 @@ func portCmd(c *cliconfig.PortValues) error {
 		}
 	}
 
-	runtime, err := libpodruntime.GetRuntime(getContext(), &c.PodmanCommand)
+	runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
 
-	if !c.Latest && !c.All {
-		container, err = runtime.LookupContainer(containerName)
-		if err != nil {
-			return errors.Wrapf(err, "unable to find container %s", containerName)
-		}
-		containers = append(containers, container)
-	} else if c.Latest {
-		container, err = runtime.GetLatestContainer()
-		if err != nil {
-			return errors.Wrapf(err, "unable to get last created container")
-		}
-		containers = append(containers, container)
-	} else {
-		containers, err = runtime.GetRunningContainers()
-		if err != nil {
-			return errors.Wrapf(err, "unable to get all containers")
-		}
-	}
-
+	containers, err := runtime.Port(c)
 	for _, con := range containers {
-		if state, _ := con.State(); state != libpod.ContainerStateRunning {
-			continue
-		}
-
 		portmappings, err := con.PortMappings()
 		if err != nil {
 			return err