p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix integration tests build errors

Browse Source 
Caused by a merge conflict.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4c7710d5d02acf42efa667fc33cb877385f2bbeb
Component: engine
This commit is contained in:
Tonis Tiigi
2017-03-24 00:27:32 -07:00
parent dd50f0df64
commit 703c536b96
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/integration-cli/docker_cli_build_test.go
View File

@ -4783,7 +4783,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgMultipleFrom(c *check.C) {
ARG bar=def
RUN env > /out`
result := buildImage(imgName, withDockerfile(dockerfile))
result := buildImage(imgName, build.WithDockerfile(dockerfile))
result.Assert(c, icmd.Success)
result = icmd.RunCmd(icmd.Cmd{
@ -4814,7 +4814,7 @@ func (s *DockerSuite) TestBuildBuildTimeUnusedArgMultipleFrom(c *check.C) {
ARG bar
RUN env > /out`
result := buildImage(imgName, withDockerfile(dockerfile), withBuildFlags(
result := buildImage(imgName, build.WithDockerfile(dockerfile), cli.WithFlags(
"--build-arg", fmt.Sprintf("baz=abc")))
result.Assert(c, icmd.Success)
c.Assert(result.Combined(), checker.Contains, "[Warning]")
@ -5645,7 +5645,7 @@ func (s *DockerSuite) TestBuildCacheMultipleFrom(c *check.C) {
// second part of dockerfile was a repeat of first so should be cached
c.Assert(strings.Count(result.Combined(), "Using cache"), checker.Equals, 1)
result = buildImage("build2", withBuildFlags("--cache-from=build1"), withExternalBuildContext(ctx))
result = buildImage("build2", cli.WithFlags("--cache-from=build1"), withExternalBuildContext(ctx))
result.Assert(c, icmd.Success)
// now both parts of dockerfile should be cached
c.Assert(strings.Count(result.Combined(), "Using cache"), checker.Equals, 2)