From 2ed72a5d9368cab3bf9e3dadde95b3d4d50048d1 Mon Sep 17 00:00:00 2001 From: Marius Gundersen Date: Tue, 29 Dec 2015 15:35:37 +0100 Subject: [PATCH] Expose the machine readable state of a container when listing containers Updated documentation to reflect the new State property in the inspect remote api Updated API changes for 1.23 Signed-off-by: Marius Gundersen --- daemon/list.go | 1 + docs/reference/api/docker_remote_api.md | 2 ++ docs/reference/api/docker_remote_api_v1.23.md | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/daemon/list.go b/daemon/list.go index 5aebb7472d..c363814cfb 100644 --- a/daemon/list.go +++ b/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 diff --git a/docs/reference/api/docker_remote_api.md b/docs/reference/api/docker_remote_api.md index 64340f0256..377d9dd736 100644 --- a/docs/reference/api/docker_remote_api.md +++ b/docs/reference/api/docker_remote_api.md @@ -96,6 +96,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 diff --git a/docs/reference/api/docker_remote_api_v1.23.md b/docs/reference/api/docker_remote_api_v1.23.md index 29240ceae4..c56c13c029 100644 --- a/docs/reference/api/docker_remote_api_v1.23.md +++ b/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": {},