Merge pull request #13718 from runcom/fix-containers-json

SizeRW & SizeRootFs omitted if empty in /container/json call
Upstream-commit: fdd6175bca8bcd2a189e18964ec3e92645ee73c3
Component: engine

components/engine/api/types/types.go

@@ -107,8 +107,8 @@ type Container struct {
 	Command    string
 	Created    int
 	Ports      []Port
-	SizeRw     int
-	SizeRootFs int
+	SizeRw     int `json:",omitempty"`
+	SizeRootFs int `json:",omitempty"`
 	Labels     map[string]string
 	Status     string
 }

components/engine/integration-cli/docker_api_containers_test.go

@@ -71,8 +71,6 @@ func (s *DockerSuite) TestContainerApiGetJSONNoFieldsOmitted(c *check.C) {
 		"Command",
 		"Created",
 		"Ports",
-		"SizeRw",
-		"SizeRootFs",
 		"Labels",
 		"Status",
 	}