kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #30776 from WeiZhang555/stats-all-format-name-panic-cli

Browse source 
Fix panic of "docker stats --format {{.Name}} --all"
(cherry picked from commit f5116c6802)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Alexander Morozov 2017-02-08 11:40:06 -08:00 committed by Sebastiaan van Stijn
parent 1c47c89d76
commit e301d956b7
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/command/formatter/stats.go
View file

@ -145,8 +145,10 @@ func (c *containerStatsContext) Container() string {
func (c *containerStatsContext) Name() string { func (c *containerStatsContext) Name() string {
c.AddHeader(nameHeader) c.AddHeader(nameHeader)
name := c.s.Name[1:] if len(c.s.Name) > 1 {
return name return c.s.Name[1:]
}
return "--"
} }
func (c *containerStatsContext) ID() string { func (c *containerStatsContext) ID() string {

8
cli/command/formatter/stats_test.go
View file

@ -69,6 +69,12 @@ func TestContainerStatsContextWrite(t *testing.T) {
`MEM USAGE / LIMIT `MEM USAGE / LIMIT
20 B / 20 B 20 B / 20 B
-- / -- -- / --
`,
},
{
Context{Format: "{{.Container}} {{.ID}} {{.Name}}"},
`container1 abcdef foo
container2 --
`, `,
}, },
{ {
@ -83,6 +89,8 @@ container2 --
stats := []StatsEntry{ stats := []StatsEntry{
{ {
Container: "container1", Container: "container1",
ID: "abcdef",
Name: "/foo",
CPUPercentage: 20, CPUPercentage: 20,
Memory: 20, Memory: 20,
MemoryLimit: 20, MemoryLimit: 20,