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

Merge pull request #18985 from hqhq/hq_handle_dockerCmdInDir 

Handle error for dockerCmdInDir
This commit is contained in:
Vincent Demeester 2015-12-30 15:25:20 +01:00
parent 024eead82f 1b34008532
commit c4486e48f2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
integration-cli/docker_cli_build_unix_test.go
View File

@ -21,7 +21,10 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) {
`, map[string]string{}) `, map[string]string{})
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
dockerCmdInDir(c, ctx.Dir, "build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "-t", name, ".") _, _, err = dockerCmdInDir(c, ctx.Dir, "build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "-t", name, ".")
if err != nil {
c.Fatal(err)
}
out, _ := dockerCmd(c, "ps", "-lq") out, _ := dockerCmd(c, "ps", "-lq")
cID := strings.TrimSpace(out) cID := strings.TrimSpace(out)