From d6b42c480eced1bfa6e64787808789de2d42775f Mon Sep 17 00:00:00 2001 From: Joir-dan Gumbs Date: Wed, 30 Mar 2016 15:23:01 -0700 Subject: [PATCH 1/3] Added extra filtering options to containers command in ClientAPI Signed-off-by: Joir-dan Gumbs Signed-off-by: Joir-dan Gumbs --- docs/api.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api.md b/docs/api.md index 3b0eda6926..ade7a58123 100644 --- a/docs/api.md +++ b/docs/api.md @@ -148,6 +148,11 @@ non-running ones - `exited` (int): Only containers with specified exit code - `status` (str): One of `restarting`, `running`, `paused`, `exited` - `label` (str): format either `"key"` or `"key=value"` + - `id` (str): The id of the container. + - `name` (str): The name of the container. + - `ancestor` (str): Filter by container ancestor. Format of `[:tag]`, ``, or ``. + - `before` (str): Only containers created before a particular container. Give the container name or id. + - `since` (str): Only containers created after a particular container. Give container name or id. **Returns** (dict): The system's containers From 14423d2b541a41f7c46aa00a74a24a6c321b9a74 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 30 Mar 2016 17:18:04 -0700 Subject: [PATCH 2/3] Bump RC Signed-off-by: Joffrey F Signed-off-by: Joir-dan Gumbs --- docker/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/version.py b/docker/version.py index 97d5ac2eb2..d53b6f4eea 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "1.8.0-rc3" +version = "1.8.0-rc4" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) From 1c8ce07785dc4f6f8ab20f58fe5439a75f968135 Mon Sep 17 00:00:00 2001 From: Joir-dan Gumbs Date: Tue, 19 Apr 2016 23:19:55 -0700 Subject: [PATCH 3/3] Added link to docker ps documentation Signed-off-by: Joir-dan Gumbs --- docs/api.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api.md b/docs/api.md index ade7a58123..08131fc201 100644 --- a/docs/api.md +++ b/docs/api.md @@ -154,6 +154,8 @@ non-running ones - `before` (str): Only containers created before a particular container. Give the container name or id. - `since` (str): Only containers created after a particular container. Give container name or id. + A comprehensive list can be found [here](https://docs.docker.com/engine/reference/commandline/ps/) + **Returns** (dict): The system's containers ```python