From 4c7710d5d02acf42efa667fc33cb877385f2bbeb Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Fri, 24 Mar 2017 00:27:32 -0700 Subject: [PATCH] Fix integration tests build errors Caused by a merge conflict. Signed-off-by: Tonis Tiigi --- integration-cli/docker_cli_build_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 59dd0a6880..1db56296a6 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -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)