Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

expose RemovalInProgress in StateString #25652 

Signed-off-by: timfeirg <kkcocogogo@gmail.com>
This commit is contained in:
timfeirg 2016-08-15 19:33:56 +08:00 committed by Tibor Vass
parent ebc23f6116
commit 280a6f9663
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/bash/docker
View File

@ -2182,7 +2182,7 @@ _docker_ps() {
return return
;; ;;
status) status)
COMPREPLY=( $( compgen -W "created dead exited paused restarting running" -- "${cur##*=}" ) ) COMPREPLY=( $( compgen -W "created dead exited paused restarting running removing" -- "${cur##*=}" ) )
return return
;; ;;
volume) volume)

2
contrib/completion/zsh/_docker
View File

@ -340,7 +340,7 @@ __docker_complete_ps_filters() {
__docker_networks && ret=0 __docker_networks && ret=0
;; ;;
(status) (status)
status_opts=('created' 'dead' 'exited' 'paused' 'restarting' 'running') status_opts=('created' 'dead' 'exited' 'paused' 'restarting' 'running' 'removing')
_describe -t status-filter-opts "Status Filter Options" status_opts && ret=0 _describe -t status-filter-opts "Status Filter Options" status_opts && ret=0
;; ;;
(volume) (volume)

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

@ -20,7 +20,7 @@ Options:
-f, --filter value Filter output based on conditions provided (default []) -f, --filter value Filter output based on conditions provided (default [])
- exited=<int> an exit code of <int> - exited=<int> an exit code of <int>
- label=<key> or label=<key>=<value> - label=<key> or label=<key>=<value>
- status=(created|restarting|running|paused|exited) - status=(created|restarting|removing|running|paused|exited)
- name=<string> a container's name - name=<string> a container's name
- id=<ID> a container's ID - id=<ID> a container's ID
- before=(<container-name>|<container-id>) - before=(<container-name>|<container-id>)
@ -68,7 +68,7 @@ The currently supported filters are:
* label (`label=<key>` or `label=<key>=<value>`) * label (`label=<key>` or `label=<key>=<value>`)
* name (container's name) * name (container's name)
* exited (int - the code of exited containers. Only useful with `--all`) * exited (int - the code of exited containers. Only useful with `--all`)
* status (created|restarting|running|paused|exited|dead) * status (created|restarting|running|removing|paused|exited|dead)
* ancestor (`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`) - filters containers that were created from the given image or a descendant. * ancestor (`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`) - filters containers that were created from the given image or a descendant.
* before (container's id or name) - filters containers created before given id or name * before (container's id or name) - filters containers created before given id or name
* since (container's id or name) - filters containers created since given id or name * since (container's id or name) - filters containers created since given id or name
@ -158,7 +158,7 @@ Any of these events result in a `137` status:
#### Status #### Status
The `status` filter matches containers by status. You can filter using The `status` filter matches containers by status. You can filter using
`created`, `restarting`, `running`, `paused`, `exited` and `dead`. For example, `created`, `restarting`, `running`, `removing`, `paused`, `exited` and `dead`. For example,
to filter for `running` containers: to filter for `running` containers:
```bash ```bash