From c326e0afe39d19a789f0819cb3d81259167a762f Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Thu, 29 Sep 2016 18:55:52 -0700 Subject: [PATCH] Update docs for node filter of `docker service ps` As is specified in 26964, it is possible to specify a filter based on the node name or node ID. This fix updates the related docs for that. Signed-off-by: Yong Tang --- docs/reference/api/docker_remote_api_v1.24.md | 2 +- docs/reference/api/docker_remote_api_v1.25.md | 2 +- docs/reference/commandline/service_ps.md | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index 23fd58da2b..c2023d5568 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -5095,7 +5095,7 @@ List tasks - `id=` - `name=` - `service=` - - `node=` + - `node=` - `label=key` or `label="key=value"` - `desired-state=(running | shutdown | accepted)` diff --git a/docs/reference/api/docker_remote_api_v1.25.md b/docs/reference/api/docker_remote_api_v1.25.md index 96b3e3801e..e940a65c17 100644 --- a/docs/reference/api/docker_remote_api_v1.25.md +++ b/docs/reference/api/docker_remote_api_v1.25.md @@ -5262,7 +5262,7 @@ List tasks - `id=` - `name=` - `service=` - - `node=` + - `node=` - `label=key` or `label="key=value"` - `desired-state=(running | shutdown | accepted)` diff --git a/docs/reference/commandline/service_ps.md b/docs/reference/commandline/service_ps.md index 231ef0d733..d6f9de5f27 100644 --- a/docs/reference/commandline/service_ps.md +++ b/docs/reference/commandline/service_ps.md @@ -61,6 +61,7 @@ The currently supported filters are: * [id](#id) * [name](#name) +* [node](#node) * [desired-state](#desired-state) @@ -86,6 +87,20 @@ redis.1.0qihejybwf1x5vqi8lgzlgnpq redis:3.0.6 manager1 Running Runnin ``` +#### Node + +The `node` filter matches on a node name or a node ID. + +```bash +$ docker service ps -f "node=manager1" redis +NAME IMAGE NODE DESIRED STATE CURRENT STATE +redis.1.0qihejybwf1x5vqi8lgzlgnpq redis:3.0.6 manager1 Running Running 8 seconds +redis.5.1x0v8yomsncd6sbvfn0ph6ogc redis:3.0.6 manager1 Running Running 8 seconds +redis.9.3w1wu13yuplna8ri3fx47iwad redis:3.0.6 manager1 Running Running 8 seconds +redis.10.8eaxrb2fqpbnv9x30vr06i6vt redis:3.0.6 manager1 Running Running 8 seconds +``` + + #### desired-state The `desired-state` filter can take the values `running`, `shutdown`, and `accepted`.