clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-07 06:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integration tests for --bridge daemon flag

Browse Source 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal
2015-04-29 09:55:25 -07:00
parent 44f8c44e5f
commit f3f5ff9d83
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_utils.go
+7 -2
View File
@@ -570,8 +570,9 @@ func dockerCmdInDirWithTimeout(timeout time.Duration, path string, args ...strin
return out, status, err
}
func findContainerIP(c *check.C, id string) string {
cmd := exec.Command(dockerBinary, "inspect", "--format='{{ .NetworkSettings.IPAddress }}'", id)
func findContainerIP(c *check.C, id string, vargs ...string) string {
args := append(vargs, "inspect", "--format='{{ .NetworkSettings.IPAddress }}'", id)
cmd := exec.Command(dockerBinary, args...)
out, _, err := runCommandWithOutput(cmd)
if err != nil {
c.Fatal(err, out)
@@ -580,6 +581,10 @@ func findContainerIP(c *check.C, id string) string {
return strings.Trim(out, " \r\n'")
}
func (d *Daemon) findContainerIP(c *check.C, id string) string {
return findContainerIP(c, id, "--host", d.sock())
}
func getContainerCount() (int, error) {
const containers = "Containers:"