Merge pull request #2683 from giuseppe/fix-pod-top

rootless: fix pod top

2 files changed, 27 insertions, 0 deletions

diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index b130f3232..ef300ef75 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -76,6 +76,7 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
 	_podKillCommand:  true,
 	_podStatsCommand: true,
 	_podStopCommand:  true,
+	_podTopCommand:   true,
 	_restartCommand:  true,
 	_rmCommand:       true,
 	_runCommand:      true,
diff --git a/cmd/podman/pod_top.go b/cmd/podman/pod_top.go
index c9a6d8822..f65d66df6 100644
--- a/cmd/podman/pod_top.go
+++ b/cmd/podman/pod_top.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -53,6 +54,10 @@ func podTopCmd(c *cliconfig.PodTopValues) error {
 	)
 	args := c.InputArgs
 
+	if os.Geteuid() != 0 {
+		rootless.SetSkipStorageSetup(true)
+	}
+
 	if c.ListDescriptors {
 		descriptors, err := libpod.GetContainerPidInformationDescriptors()
 		if err != nil {
@@ -77,6 +82,27 @@ func podTopCmd(c *cliconfig.PodTopValues) error {
 	} else {
 		descriptors = args[1:]
 	}
+
+	if os.Geteuid() != 0 {
+		var pod *adapter.Pod
+		var err error
+		if c.Latest {
+			pod, err = runtime.GetLatestPod()
+		} else {
+			pod, err = runtime.LookupPod(c.InputArgs[0])
+		}
+		if err != nil {
+			return errors.Wrapf(err, "unable to lookup requested container")
+		}
+		became, ret, err := runtime.JoinOrCreateRootlessPod(pod)
+		if err != nil {
+			return err
+		}
+		if became {
+			os.Exit(ret)
+		}
+	}
+
 	w := tabwriter.NewWriter(os.Stdout, 5, 1, 3, ' ', 0)
 	psOutput, err := runtime.PodTop(c, descriptors)
 	if err != nil {