0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #28723 from dattatrayakumbhar/filter-on-network-id

Browse source 
28722: List of containers with networkID filter is not working
This commit is contained in:
Vincent Demeester 2017-04-02 21:06:09 +02:00 • committed by GitHub
commit 33aae7c5cc
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/list.go
View file

@ -504,7 +504,7 @@ func includeContainerInList(container *container.Container, ctx *listContext) it
if nw.EndpointSettings == nil {
continue
}
if nw.NetworkID == value {
if strings.HasPrefix(nw.NetworkID, value) {
return networkExist
}
}

17
integration-cli/docker_cli_ps_test.go
View file

@ -877,6 +877,23 @@ func (s *DockerSuite) TestPsListContainersFilterNetwork(c *check.C) {
containerOut = strings.TrimSpace(string(out))
c.Assert(containerOut, checker.Contains, "onbridgenetwork")
// Filter by partial network ID
partialnwID := string(nwID[0:4])
out, _ = dockerCmd(c, "ps", "--filter", "network="+partialnwID)
containerOut = strings.TrimSpace(string(out))
lines = strings.Split(containerOut, "\n")
// skip header
lines = lines[1:]
// ps output should have only one container
c.Assert(lines, checker.HasLen, 1)
// Making sure onbridgenetwork is on the output
c.Assert(containerOut, checker.Contains, "onbridgenetwork", check.Commentf("Missing the container on network\n"))
}
func (s *DockerSuite) TestPsByOrder(c *check.C) {