summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-03-08 12:10:40 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-03-11 11:48:27 +0100
commitd6ebccf7c2cc2d337de497bb8388895aa8320b1d (patch)
treeed5c98a36359580bfe24477e28c1163ebf1c94d4 /cmd/podman
parent4a0fb35335bd9b0f78bb63d13da6a46d6b8843d8 (diff)
downloadpodman-d6ebccf7c2cc2d337de497bb8388895aa8320b1d.tar.gz
podman-d6ebccf7c2cc2d337de497bb8388895aa8320b1d.tar.bz2
podman-d6ebccf7c2cc2d337de497bb8388895aa8320b1d.zip
rootless: disable pod stats
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/main.go27
-rw-r--r--cmd/podman/pod_stats.go5
2 files changed, 19 insertions, 13 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index ef68ebb2e..1d3db70eb 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -65,19 +65,20 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
_exportCommand: true,
//// `info` must be executed in an user namespace.
//// If this change, please also update libpod.refreshRootless()
- _loginCommand: true,
- _logoutCommand: true,
- _mountCommand: true,
- _killCommand: true,
- _pauseCommand: true,
- _podKillCommand: true,
- _restartCommand: true,
- _runCommand: true,
- _unpauseCommand: true,
- _searchCommand: true,
- _statsCommand: true,
- _stopCommand: true,
- _topCommand: true,
+ _loginCommand: true,
+ _logoutCommand: true,
+ _mountCommand: true,
+ _killCommand: true,
+ _pauseCommand: true,
+ _podKillCommand: true,
+ _podStatsCommand: true,
+ _restartCommand: true,
+ _runCommand: true,
+ _unpauseCommand: true,
+ _searchCommand: true,
+ _statsCommand: true,
+ _stopCommand: true,
+ _topCommand: true,
}
var rootCmd = &cobra.Command{
diff --git a/cmd/podman/pod_stats.go b/cmd/podman/pod_stats.go
index 7dbd84525..5c30e0595 100644
--- a/cmd/podman/pod_stats.go
+++ b/cmd/podman/pod_stats.go
@@ -53,6 +53,11 @@ func init() {
}
func podStatsCmd(c *cliconfig.PodStatsValues) error {
+
+ if os.Geteuid() != 0 {
+ return errors.New("stats is not supported in rootless mode")
+ }
+
format := c.Format
all := c.All
latest := c.Latest