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

Add `--filter scope=swarm|local` for `docker network ls` 

This fix tries to address the request in 31324 by adding
`--filter scope=swarm|local` for `docker network ls`.

As `docker network ls` has a `SCOPE` column by default,
it is natural to add the support of `--filter scope=swarm|local`.

This fix adds the `scope=swarm|local` support for
`docker network ls --filter`.

Related docs has been updated.

Additional unit test cases have been added.

This fix fixes 31324.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2017-03-03 10:45:48 -08:00 committed by Tibor Vass
parent 9be3a2cec8
commit 6f22676f0b
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docs/reference/commandline/network_ls.md
View File

@ -74,6 +74,7 @@ The currently supported filters are:
* id (network's id) * id (network's id)
* label (`label=<key>` or `label=<key>=<value>`) * label (`label=<key>` or `label=<key>=<value>`)
* name (network's name) * name (network's name)
* scope (`swarm|global|local`)
* type (`custom|builtin`) * type (`custom|builtin`)
#### Driver #### Driver
@ -157,6 +158,30 @@ NETWORK ID NAME DRIVER SCOPE
06e7eef0a170 foobar bridge local 06e7eef0a170 foobar bridge local
``` ```
#### Scope
The `scope` filter matches networks based on their scope.
The following example matches networks with the `swarm` scope:
```bash
$ docker network ls --filter scope=swarm
NETWORK ID NAME DRIVER SCOPE
xbtm0v4f1lfh ingress overlay swarm
ic6r88twuu92 swarmnet overlay swarm
```
The following example matches networks with the `local` scope:
```bash
$ docker network ls --filter scope=local
NETWORK ID NAME DRIVER SCOPE
e85227439ac7 bridge bridge local
0ca0e19443ed host host local
ca13cc149a36 localnet bridge local
f9e115d2de35 none null local
```
#### Type #### Type
The `type` filter supports two values; `builtin` displays predefined networks The `type` filter supports two values; `builtin` displays predefined networks

25
man/src/network/ls.md
View File

@ -35,6 +35,7 @@ The currently supported filters are:
* id (network's id) * id (network's id)
* label (`label=<key>` or `label=<key>=<value>`) * label (`label=<key>` or `label=<key>=<value>`)
* name (network's name) * name (network's name)
* scope (`swarm|global|local`)
* type (custom|builtin) * type (custom|builtin)
#### Driver #### Driver
@ -118,6 +119,30 @@ NETWORK ID NAME DRIVER
06e7eef0a170 foobar bridge 06e7eef0a170 foobar bridge
``` ```
#### Scope
The `scope` filter matches networks based on their scope.
The following example matches networks with the `swarm` scope:
```bash
$ docker network ls --filter scope=swarm
NETWORK ID NAME DRIVER SCOPE
xbtm0v4f1lfh ingress overlay swarm
ic6r88twuu92 swarmnet overlay swarm
```
The following example matches networks with the `local` scope:
```bash
$ docker network ls --filter scope=local
NETWORK ID NAME DRIVER SCOPE
e85227439ac7 bridge bridge local
0ca0e19443ed host host local
ca13cc149a36 localnet bridge local
f9e115d2de35 none null local
```
#### Type #### Type
The `type` filter supports two values; `builtin` displays predefined networks The `type` filter supports two values; `builtin` displays predefined networks