GitList

Browse code

Added additional container information to "docker info".

Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.

Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)

Kim Eik authored on 2015/10/28 05:12:33
Showing 9 changed files

api/client/info.go index b309dbf..42f0682 100644
daemon/info.go index d060a14..5678d76 100644
docs/reference/commandline/info.md index c776ced..51ae269 100644
docs/userguide/labels-custom-metadata.md index 1a57eaf..ae6a3c5 100644
integration-cli/check_test.go index 29ae8b8..206b600 100644
integration-cli/docker_api_info_test.go index 479bf5f..9e6af66 100644
integration-cli/docker_cli_info_test.go index 6d83d33..7d2b40d 100644
man/docker-info.1.md index ae04e49..0dc46c1 100644
vendor/src/github.com/docker/engine-api/types/types.go index 946ab03..1bf86e5 100644

api/client/info.go

History View file @ e732f4e

@@ -25,6 +25,9 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
+                     	}
                      	fmt.Fprintf(cli.out, "Containers: %d\n", info.Containers)
                     +	fmt.Fprintf(cli.out, " Running: %d\n", info.ContainersRunning)
                     +	fmt.Fprintf(cli.out, " Paused: %d\n", info.ContainersPaused)
                     +	fmt.Fprintf(cli.out, " Stopped: %d\n", info.ContainersStopped)
                      	fmt.Fprintf(cli.out, "Images: %d\n", info.Images)
                      	ioutils.FprintfIfNotEmpty(cli.out, "Server Version: %s\n", info.ServerVersion)
                      	ioutils.FprintfIfNotEmpty(cli.out, "Storage Driver: %s\n", info.Driver)

daemon/info.go

History View file @ e732f4e

@@ -54,9 +54,24 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
                      	initPath := utils.DockerInitPath("")
                      	sysInfo := sysinfo.New(true)
                     +	var cRunning, cPaused, cStopped int
                     +	for _, c := range daemon.List() {
                     +		switch c.StateString() {
                     +		case "paused":
                     +			cPaused++
                     +		case "running":
                     +			cRunning++
                     +		default:
                     +			cStopped++
                     +		}
                     +	}
+                    +
                      	v := &types.Info{
                      		ID:                 daemon.ID,
                      		Containers:         len(daemon.List()),
                     +		ContainersRunning:  cRunning,
                     +		ContainersPaused:   cPaused,
                     +		ContainersStopped:  cStopped,
                      		Images:             len(daemon.imageStore.Map()),
                      		Driver:             daemon.GraphDriverName(),
                      		DriverStatus:       daemon.layerStore.DriverStatus(),

docs/reference/commandline/info.md

History View file @ e732f4e

@@ -21,6 +21,9 @@ For example:
                          $ docker -D info
                          Containers: 14
                     +     Running: 3
                     +     Paused: 1
                     +     Stopped: 10
                          Images: 52
                          Server Version: 1.9.0
                          Storage Driver: aufs

docs/userguide/labels-custom-metadata.md

History View file @ e732f4e

@@ -192,6 +192,9 @@ These labels appear as part of the `docker info` output for the daemon:
                          $ docker -D info
                          Containers: 12
                     +     Running: 5
                     +     Paused: 2
                     +     Stopped: 5
                          Images: 672
                          Server Version: 1.9.0
                          Storage Driver: aufs

integration-cli/check_test.go

History View file @ e732f4e

@@ -28,6 +28,7 @@ type DockerSuite struct {
+                     }
                      func (s *DockerSuite) TearDownTest(c *check.C) {
                     +	unpauseAllContainers()
                      	deleteAllContainers()
                      	deleteAllImages()
                      	deleteAllVolumes()

integration-cli/docker_api_info_test.go

History View file @ e732f4e

@@ -18,6 +18,9 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
                      	stringsToCheck := []string{
                      		"ID",
                      		"Containers",
                     +		"ContainersRunning",
                     +		"ContainersPaused",
                     +		"ContainersStopped",
                      		"Images",
                      		"ExecutionDriver",
                      		"LoggingDriver",

integration-cli/docker_cli_info_test.go

History View file @ e732f4e

@@ -3,6 +3,7 @@ package main
                      import (
                      	"fmt"
                      	"net"
                     +	"strings"
                      	"github.com/docker/docker/pkg/integration/checker"
                      	"github.com/docker/docker/utils"
@@ -17,6 +18,9 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
                      	stringsToCheck := []string{
                      		"ID:",
                      		"Containers:",
                     +		" Running:",
                     +		" Paused:",
                     +		" Stopped:",
                      		"Images:",
                      		"Execution Driver:",
                      		"OSType:",
@@ -101,3 +105,44 @@ func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {
                      	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster store: %s\n", discoveryBackend))
                      	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster advertise: %s:2375\n", ip.String()))
+                     }
+                    +
                     +func (s *DockerSuite) TestInfoDisplaysRunningContainers(c *check.C) {
                     +	testRequires(c, DaemonIsLinux)
+                    +
                     +	dockerCmd(c, "run", "-d", "busybox", "top")
                     +	out, _ := dockerCmd(c, "info")
                     +	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 1))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 0))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 0))
                     +}
+                    +
                     +func (s *DockerSuite) TestInfoDisplaysPausedContainers(c *check.C) {
                     +	testRequires(c, DaemonIsLinux)
+                    +
                     +	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
                     +	cleanedContainerID := strings.TrimSpace(out)
+                    +
                     +	dockerCmd(c, "pause", cleanedContainerID)
+                    +
                     +	out, _ = dockerCmd(c, "info")
                     +	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 0))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 1))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 0))
                     +}
+                    +
                     +func (s *DockerSuite) TestInfoDisplaysStoppedContainers(c *check.C) {
                     +	testRequires(c, DaemonIsLinux)
+                    +
                     +	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
                     +	cleanedContainerID := strings.TrimSpace(out)
+                    +
                     +	dockerCmd(c, "stop", cleanedContainerID)
+                    +
                     +	out, _ = dockerCmd(c, "info")
                     +	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 0))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 0))
                     +	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 1))
                     +}

man/docker-info.1.md

History View file @ e732f4e

@@ -32,6 +32,9 @@ Here is a sample output:
                          # docker info
                          Containers: 14
                     +     Running: 3
                     +     Paused: 1
                     +     Stopped: 10
                          Images: 52
                          Server Version: 1.9.0
                          Storage Driver: aufs

vendor/src/github.com/docker/engine-api/types/types.go

History View file @ e732f4e

@@ -192,6 +192,9 @@ type Version struct {
                      type Info struct {
                      	ID                 string
                      	Containers         int
                     +	ContainersRunning  int
                     +	ContainersPaused   int
                     +	ContainersStopped  int
                      	Images             int
                      	Driver             string
                      	DriverStatus       [][2]string