Merge pull request #18966 from mariusGundersen/machine-readable-state

Expose the machine readable state of a container when listing containers

daemon/list.go

@@ -347,6 +347,7 @@ func (daemon *Daemon) transformContainer(container *container.Container, ctx *li
 		newC.Command = container.Path
 	}
 	newC.Created = container.Created.Unix()
+	newC.State = container.State.StateString()
 	newC.Status = container.State.String()
 	newC.HostConfig.NetworkMode = string(container.HostConfig.NetworkMode)
 	// copy networks to avoid races

docs/reference/api/docker_remote_api.md

@@ -104,6 +104,8 @@ This section lists each version from latest to oldest.  Each listing includes a
 
 [Docker Remote API v1.23](docker_remote_api_v1.23.md) documentation
 
+* `GET /containers/json` returns the state of the container, one of `created`, `restarting`, `running`, `paused`, `exited` or `dead`.
+
 
 ### v1.22 API changes
 

docs/reference/api/docker_remote_api_v1.23.md

@@ -49,6 +49,7 @@ List containers
                  "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
                  "Command": "echo 1",
                  "Created": 1367854155,
+                 "State": "Exited",
                  "Status": "Exit 0",
                  "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
                  "Labels": {
@@ -81,6 +82,7 @@ List containers
                  "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
                  "Command": "echo 222222",
                  "Created": 1367854155,
+                 "State": "Exited",
                  "Status": "Exit 0",
                  "Ports": [],
                  "Labels": {},
@@ -110,6 +112,7 @@ List containers
                  "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
                  "Command": "echo 3333333333333333",
                  "Created": 1367854154,
+                 "State": "Exited",
                  "Status": "Exit 0",
                  "Ports":[],
                  "Labels": {},
@@ -139,6 +142,7 @@ List containers
                  "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
                  "Command": "echo 444444444444444444444444444444444",
                  "Created": 1367854152,
+                 "State": "Exited",
                  "Status": "Exit 0",
                  "Ports": [],
                  "Labels": {},