dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-03 06:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32200 from yuexiao-wang/update-usage

Browse Source 
fix inconsistency for docker service ps
(cherry picked from commit 278b36e5ce)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Aaron Lehmann
2017-03-29 13:58:14 -07:00
committed by Sebastiaan van Stijn
parent 7ec084a742
commit 1b91555700
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/commandline/service.md
View File

@@ -28,7 +28,7 @@ Commands:
inspect Display detailed information on one or more services
logs Fetch the logs of a service
ls List services
ps List the tasks of a service
ps List the tasks of one or more services
rm Remove one or more services
scale Scale one or multiple replicated services
update Update a service

6
docs/reference/commandline/service_ps.md
View File

@@ -17,7 +17,7 @@ aliases: ["/engine/reference/commandline/service_tasks/"]
# service ps
```Markdown
Usage: docker service ps [OPTIONS] SERVICE
Usage: docker service ps [OPTIONS] SERVICE [SERVICE...]
List the tasks of one or more services
@@ -147,12 +147,10 @@ ID NAME IMAGE NODE DESIRED STATE CURRENT STATE
8eaxrb2fqpbn redis.10 redis:3.0.6 manager1 Running Running 8 seconds
```
#### desired-state
The `desired-state` filter can take the values `running`, `shutdown`, or `accepted`.
### Formatting
The formatting options (`--format`) pretty-prints tasks output
@@ -176,7 +174,7 @@ output the data exactly as the template declares or, when using the
`table` directive, includes column headers as well.
The following example uses a template without headers and outputs the
`ID` and `Driver` entries separated by a colon for all tasks:
`Name` and `Image` entries separated by a colon for all tasks:
```bash
$ docker service ps --format "{{.Name}}: {{.Image}}" top