@@ -1588,7 +1588,7 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 	var testImg string

 	if testEnv.DaemonInfo.OSType != "windows" {

 		testImg = "test-mount-config"

-		buildImageSuccessfully(c, testImg, build.WithDockerfile(`

+		cli.BuildCmd(c, testImg, build.WithDockerfile(`

 	FROM busybox

 	RUN mkdir `+destPath+` && touch `+destPath+slash+`bar

 	CMD cat `+destPath+slash+`bar

@@ -16,7 +16,7 @@ import (

 func (s *DockerAPISuite) TestAPIImagesSaveAndLoad(c *testing.T) {

 	testRequires(c, Network)

-	buildImageSuccessfully(c, "saveandload", build.WithDockerfile("FROM busybox\nENV FOO bar"))

+	cli.BuildCmd(c, "saveandload", build.WithDockerfile("FROM busybox\nENV FOO bar"))

 	id := getIDByName(c, "saveandload")

 	ctx := testutil.GetContext(c)

@@ -45,7 +45,7 @@ func (s *DockerAPISuite) TestAPIImagesDelete(c *testing.T) {

 		testRequires(c, Network)

 	}

 	name := "test-api-images-delete"

-	buildImageSuccessfully(c, name, build.WithDockerfile("FROM busybox\nENV FOO bar"))

+	cli.BuildCmd(c, name, build.WithDockerfile("FROM busybox\nENV FOO bar"))

 	id := getIDByName(c, name)

 	cli.DockerCmd(c, "tag", name, "test:tag1")

@@ -61,7 +61,7 @@ func (s *DockerCLIBuildSuite) TestBuildShCmdJSONEntrypoint(c *testing.T) {

 		expected = "cmd /S /C echo test"

 	}

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

     FROM busybox

     ENTRYPOINT ["echo"]

     CMD echo test

@@ -78,7 +78,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementUser(c *testing.T)

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildenvironmentreplacement"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

   FROM scratch

   ENV user foo

   USER ${user}

@@ -101,7 +101,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementVolume(c *testing.T

 		volumePath = "/quux"

 	}

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

   FROM `+minimalBaseImage()+`

   ENV volume `+volumePath+`

   VOLUME ${volume}

@@ -119,7 +119,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementExpose(c *testing.T

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildenvironmentreplacement"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

   FROM scratch

   ENV port 80

   EXPOSE ${port}

@@ -141,7 +141,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementExpose(c *testing.T

 func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementWorkdir(c *testing.T) {

 	const name = "testbuildenvironmentreplacement"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

   FROM busybox

   ENV MYWORKDIR /work

   RUN mkdir ${MYWORKDIR}

@@ -161,7 +161,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementWorkdir(c *testing.

 func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementAddCopy(c *testing.T) {

 	const name = "testbuildenvironmentreplacement"

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `

   FROM `+minimalBaseImage()+`

   ENV baz foo

@@ -187,7 +187,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementEnv(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildenvironmentreplacement"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

   FROM busybox

   ENV foo zzz

   ENV bar ${foo}

@@ -271,7 +271,7 @@ func (s *DockerCLIBuildSuite) TestBuildHandleEscapesInVolume(c *testing.T) {

 	}

 	for _, tc := range testCases {

-		buildImageSuccessfully(c, name, build.WithDockerfile(fmt.Sprintf(`

+		cli.BuildCmd(c, name, build.WithDockerfile(fmt.Sprintf(`

   FROM scratch

   ENV FOO bar

   VOLUME %s

@@ -292,7 +292,7 @@ func (s *DockerCLIBuildSuite) TestBuildOnBuildLowercase(c *testing.T) {

 	const name = "testbuildonbuildlowercase"

 	const name2 = "testbuildonbuildlowercase2"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

   FROM busybox

   onbuild run echo quux

   `))

@@ -316,7 +316,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvEscapes(c *testing.T) {

 	// ENV expansions work differently in Windows

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildenvescapes"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

     FROM busybox

     ENV TEST foo

     CMD echo \$

@@ -332,7 +332,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvOverwrite(c *testing.T) {

 	// ENV expansions work differently in Windows

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildenvoverwrite"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

     FROM busybox

     ENV TEST foo

     CMD echo ${TEST}

@@ -366,11 +366,11 @@ func (s *DockerCLIBuildSuite) TestBuildOnBuildEntrypointJSON(c *testing.T) {

 	const name1 = "onbuildcmd"

 	const name2 = "onbuildgenerated"

-	buildImageSuccessfully(c, name1, build.WithDockerfile(`

+	cli.BuildCmd(c, name1, build.WithDockerfile(`

 FROM busybox

 ONBUILD ENTRYPOINT ["echo"]`))

-	buildImageSuccessfully(c, name2, build.WithDockerfile(fmt.Sprintf("FROM %s\nCMD [\"hello world\"]\n", name1)))

+	cli.BuildCmd(c, name2, build.WithDockerfile(fmt.Sprintf("FROM %s\nCMD [\"hello world\"]\n", name1)))

 	out := cli.DockerCmd(c, "run", name2).Combined()

 	if !regexp.MustCompile(`(?m)^hello world`).MatchString(out) {

@@ -460,12 +460,12 @@ ADD folder/file /test/changetarget`))

 	if err := ctx.Add("folder/file", "first"); err != nil {

 		c.Fatal(err)

 	}

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id1 := getIDByName(c, name)

 	if err := ctx.Add("folder/file", "second"); err != nil {

 		c.Fatal(err)

 	}

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id2 := getIDByName(c, name)

 	if id1 == id2 {

 		c.Fatal("cache was used even though file contents in folder was changed")

@@ -474,7 +474,7 @@ ADD folder/file /test/changetarget`))

 func (s *DockerCLIBuildSuite) TestBuildAddSingleFileToRoot(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testaddimg", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testaddimg", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -692,7 +692,7 @@ func (s *DockerCLIBuildSuite) TestBuildCopyWildcardInName(c *testing.T) {

 	// say which OSs this works on or not.

 	testRequires(c, DaemonIsLinux, UnixCli)

-	buildImageSuccessfully(c, "testcopywildcardinname", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopywildcardinname", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 	COPY *.txt /tmp/

 	RUN [ "$(cat /tmp/\*.txt)" = 'hi there' ]

@@ -710,7 +710,7 @@ func (s *DockerCLIBuildSuite) TestBuildCopyWildcardCache(c *testing.T) {

 		}))

 	defer ctx.Close()

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id1 := getIDByName(c, name)

 	// Now make sure we use a cache the 2nd time even with wild cards.

@@ -718,7 +718,7 @@ func (s *DockerCLIBuildSuite) TestBuildCopyWildcardCache(c *testing.T) {

 	ctx.Add("Dockerfile", `FROM busybox

 	COPY file*.txt /tmp/`)

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id2 := getIDByName(c, name)

 	if id1 != id2 {

@@ -728,7 +728,7 @@ func (s *DockerCLIBuildSuite) TestBuildCopyWildcardCache(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildAddSingleFileToNonExistingDir(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testaddsinglefiletononexistingdir", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testaddsinglefiletononexistingdir", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -743,7 +743,7 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`),

 func (s *DockerCLIBuildSuite) TestBuildAddDirContentToRoot(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testadddircontenttoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testadddircontenttoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -757,7 +757,7 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`),

 func (s *DockerCLIBuildSuite) TestBuildAddDirContentToExistingDir(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testadddircontenttoexistingdir", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testadddircontenttoexistingdir", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -773,7 +773,7 @@ RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`),

 func (s *DockerCLIBuildSuite) TestBuildAddWholeDirToRoot(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testaddwholedirtoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testaddwholedirtoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -790,11 +790,11 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expecte

 // Testing #5941 : Having an etc directory in context conflicts with the /etc/mtab

 func (s *DockerCLIBuildSuite) TestBuildAddOrCopyEtcToRootShouldNotConflict(c *testing.T) {

-	buildImageSuccessfully(c, "testaddetctoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testaddetctoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM `+minimalBaseImage()+`

 ADD . /`),

 		build.WithFile("etc/test_file", "test1")))

-	buildImageSuccessfully(c, "testcopyetctoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopyetctoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM `+minimalBaseImage()+`

 COPY . /`),

 		build.WithFile("etc/test_file", "test1")))

@@ -803,7 +803,7 @@ COPY . /`),

 // Testing #9401 : Losing setuid flag after a ADD

 func (s *DockerCLIBuildSuite) TestBuildAddPreservesFilesSpecialBits(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testaddetctoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testaddetctoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 ADD suidbin /usr/bin/suidbin

 RUN chmod 4755 /usr/bin/suidbin

@@ -816,7 +816,7 @@ RUN [ $(ls -l /usr/bin/suidbin | awk '{print $1}') = '-rwsr-xr-x' ]`),

 func (s *DockerCLIBuildSuite) TestBuildCopySingleFileToRoot(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testcopysinglefiletoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopysinglefiletoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -854,7 +854,7 @@ COPY test_file .`),

 func (s *DockerCLIBuildSuite) TestBuildCopySingleFileToExistDir(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testcopysinglefiletoexistdir", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopysinglefiletoexistdir", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -870,7 +870,7 @@ RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio'

 func (s *DockerCLIBuildSuite) TestBuildCopySingleFileToNonExistDir(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific

-	buildImageSuccessfully(c, "testcopysinglefiletononexistdir", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopysinglefiletononexistdir", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -885,7 +885,7 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`),

 func (s *DockerCLIBuildSuite) TestBuildCopyDirContentToRoot(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testcopydircontenttoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopydircontenttoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -899,7 +899,7 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`),

 func (s *DockerCLIBuildSuite) TestBuildCopyDirContentToExistDir(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testcopydircontenttoexistdir", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopydircontenttoexistdir", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -915,7 +915,7 @@ RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`),

 func (s *DockerCLIBuildSuite) TestBuildCopyWholeDirToRoot(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Linux specific test

-	buildImageSuccessfully(c, "testcopywholedirtoroot", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testcopywholedirtoroot", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -995,7 +995,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddBadLinks(c *testing.T) {

 		c.Fatal(err)

 	}

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	if _, err := os.Stat(nonExistingFile); err == nil || !os.IsNotExist(err) {

 		c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile)

 	}

@@ -1030,7 +1030,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddBadLinksVolume(c *testing.T) {

 		c.Fatal(err)

 	}

-	buildImageSuccessfully(c, "test-link-absolute-volume", build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, "test-link-absolute-volume", build.WithExternalBuildContext(ctx))

 	if _, err := os.Stat(nonExistingFile); err == nil || !os.IsNotExist(err) {

 		c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile)

 	}

@@ -1124,7 +1124,7 @@ func (s *DockerCLIBuildSuite) TestBuildWithInaccessibleFilesInContext(c *testing

 		defer os.Remove(target)

 		// This is used to ensure we don't follow links when checking if everything in the context is accessible

 		// This test doesn't require that we run commands as an unprivileged user

-		buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+		cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	}

 	{

 		const name = "testbuildignoredinaccessible"

@@ -1203,7 +1203,7 @@ func (s *DockerCLIBuildSuite) TestBuildRm(c *testing.T) {

 	for _, tc := range testCases {

 		containerCountBefore := getContainerCount(c)

-		buildImageSuccessfully(c, name, cli.WithFlags(tc.buildflags...), build.WithDockerfile(`FROM busybox

+		cli.BuildCmd(c, name, cli.WithFlags(tc.buildflags...), build.WithDockerfile(`FROM busybox

 	RUN echo hello world`))

 		containerCountAfter := getContainerCount(c)

@@ -1239,7 +1239,7 @@ func (s *DockerCLIBuildSuite) TestBuildWithVolumes(c *testing.T) {

 		}

 	)

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM scratch

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM scratch

 		VOLUME /test1

 		VOLUME /test2

     VOLUME /test3 /test4

@@ -1258,7 +1258,7 @@ func (s *DockerCLIBuildSuite) TestBuildWithVolumes(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildMaintainer(c *testing.T) {

 	const name = "testbuildmaintainer"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

         MAINTAINER dockerio`))

 	expected := "dockerio"

@@ -1272,7 +1272,7 @@ func (s *DockerCLIBuildSuite) TestBuildUser(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuilduser"

 	expected := "dockerio"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

 		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 		USER dockerio

 		RUN [ $(whoami) = 'dockerio' ]`))

@@ -1307,7 +1307,7 @@ func (s *DockerCLIBuildSuite) TestBuildRelativeWorkdir(c *testing.T) {

 		expectedFinal = `/test2/test3`

 	}

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

 		RUN sh -c "[ "$PWD" = "`+expected1+`" ]"

 		WORKDIR test1

 		RUN sh -c "[ "$PWD" = "`+expected2+`" ]"

@@ -1326,7 +1326,7 @@ func (s *DockerCLIBuildSuite) TestBuildRelativeWorkdir(c *testing.T) {

 // Windows semantics. Most path handling verifications are in unit tests

 func (s *DockerCLIBuildSuite) TestBuildWindowsWorkdirProcessing(c *testing.T) {

 	testRequires(c, DaemonIsWindows)

-	buildImageSuccessfully(c, "testbuildwindowsworkdirprocessing", build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, "testbuildwindowsworkdirprocessing", build.WithDockerfile(`FROM busybox

 		WORKDIR C:\\foo

 		WORKDIR bar

 		RUN sh -c "[ "$PWD" = "C:/foo/bar" ]"

@@ -1341,7 +1341,7 @@ func (s *DockerCLIBuildSuite) TestBuildWindowsAddCopyPathProcessing(c *testing.T

 	// support backslash such as .\\ being equivalent to ./ and c:\\ being

 	// equivalent to c:/. This is not currently (nor ever has been) supported

 	// by docker on the Windows platform.

-	buildImageSuccessfully(c, "testbuildwindowsaddcopypathprocessing", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testbuildwindowsaddcopypathprocessing", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 			# No trailing slash on COPY/ADD

 			# Results in dir being changed to a file

@@ -1378,7 +1378,7 @@ func (s *DockerCLIBuildSuite) TestBuildWorkdirWithEnvVariables(c *testing.T) {

 		expected = `/test1/test2`

 	}

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

 		ENV DIRPATH /test1

 		ENV SUBDIRNAME test2

 		WORKDIR $DIRPATH

@@ -1400,7 +1400,7 @@ func (s *DockerCLIBuildSuite) TestBuildRelativeCopy(c *testing.T) {

 		expected = `/test1/test2`

 	}

-	buildImageSuccessfully(c, "testbuildrelativecopy", build.WithBuildContext(c,

+	cli.BuildCmd(c, "testbuildrelativecopy", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

 			WORKDIR /test1

 			WORKDIR test2

@@ -1461,7 +1461,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnv(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // ENV expansion is different in Windows

 	const name = "testbuildenv"

 	expected := "[PATH=/test:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PORT=2375]"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

 		ENV PATH /test:$PATH

 		ENV PORT 2375

 		RUN [ $(env | grep PORT) = 'PORT=2375' ]`))

@@ -1477,7 +1477,7 @@ func (s *DockerCLIBuildSuite) TestBuildPATH(c *testing.T) {

 	defPath := "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

 	fn := func(dockerfile string, expected string) {

-		buildImageSuccessfully(c, "testbldpath", build.WithDockerfile(dockerfile))

+		cli.BuildCmd(c, "testbldpath", build.WithDockerfile(dockerfile))

 		res := inspectField(c, "testbldpath", "Config.Env")

 		if res != expected {

 			c.Fatalf("Env %q, expected %q for dockerfile:%q", res, expected, dockerfile)

@@ -1509,7 +1509,7 @@ func (s *DockerCLIBuildSuite) TestBuildContextCleanup(c *testing.T) {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

         ENTRYPOINT ["/bin/echo"]`))

 	entriesFinal, err := os.ReadDir(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "tmp"))

@@ -1567,7 +1567,7 @@ func (s *DockerCLIBuildSuite) TestBuildCmd(c *testing.T) {

 	const name = "testbuildcmd"

 	expected := "[/bin/echo Hello World]"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

         CMD ["/bin/echo", "Hello World"]`))

 	res := inspectField(c, name, "Config.Cmd")

@@ -1581,7 +1581,7 @@ func (s *DockerCLIBuildSuite) TestBuildExpose(c *testing.T) {

 	const name = "testbuildexpose"

 	expected := "map[2375/tcp:{}]"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM scratch

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM scratch

         EXPOSE 2375`))

 	res := inspectField(c, name, "Config.ExposedPorts")

@@ -1617,7 +1617,7 @@ func (s *DockerCLIBuildSuite) TestBuildExposeMorePorts(c *testing.T) {

 	tmpl.Execute(buf, portList)

 	const name = "testbuildexpose"

-	buildImageSuccessfully(c, name, build.WithDockerfile(buf.String()))

+	cli.BuildCmd(c, name, build.WithDockerfile(buf.String()))

 	// check if all the ports are saved inside Config.ExposedPorts

 	res := inspectFieldJSON(c, name, "Config.ExposedPorts")

@@ -1642,7 +1642,7 @@ func (s *DockerCLIBuildSuite) TestBuildExposeMorePorts(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildExposeOrder(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows

 	buildID := func(name, exposed string) string {

-		buildImageSuccessfully(c, name, build.WithDockerfile(fmt.Sprintf(`FROM scratch

+		cli.BuildCmd(c, name, build.WithDockerfile(fmt.Sprintf(`FROM scratch

 		EXPOSE %s`, exposed)))

 		id := inspectField(c, name, "Id")

 		return id

@@ -1659,7 +1659,7 @@ func (s *DockerCLIBuildSuite) TestBuildExposeUpperCaseProto(c *testing.T) {

 	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows

 	const name = "testbuildexposeuppercaseproto"

 	expected := "map[5678/udp:{}]"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM scratch

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM scratch

         EXPOSE 5678/UDP`))

 	res := inspectField(c, name, "Config.ExposedPorts")

 	if res != expected {

@@ -1671,7 +1671,7 @@ func (s *DockerCLIBuildSuite) TestBuildEmptyEntrypointInheritance(c *testing.T)

 	const name = "testbuildentrypointinheritance"

 	const name2 = "testbuildentrypointinheritance2"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

         ENTRYPOINT ["/bin/echo"]`))

 	res := inspectField(c, name, "Config.Entrypoint")

@@ -1680,7 +1680,7 @@ func (s *DockerCLIBuildSuite) TestBuildEmptyEntrypointInheritance(c *testing.T)

 		c.Fatalf("Entrypoint %s, expected %s", res, expected)

 	}

-	buildImageSuccessfully(c, name2, build.WithDockerfile(fmt.Sprintf(`FROM %s

+	cli.BuildCmd(c, name2, build.WithDockerfile(fmt.Sprintf(`FROM %s

         ENTRYPOINT []`, name)))

 	res = inspectField(c, name2, "Config.Entrypoint")

@@ -1694,7 +1694,7 @@ func (s *DockerCLIBuildSuite) TestBuildEmptyEntrypoint(c *testing.T) {

 	const name = "testbuildentrypoint"

 	expected := "[]"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

         ENTRYPOINT []`))

 	res := inspectField(c, name, "Config.Entrypoint")

@@ -1707,7 +1707,7 @@ func (s *DockerCLIBuildSuite) TestBuildEntrypoint(c *testing.T) {

 	const name = "testbuildentrypoint"

 	expected := "[/bin/echo]"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

         ENTRYPOINT ["/bin/echo"]`))

 	res := inspectField(c, name, "Config.Entrypoint")

@@ -1718,7 +1718,7 @@ func (s *DockerCLIBuildSuite) TestBuildEntrypoint(c *testing.T) {

 // #6445 ensure ONBUILD triggers aren't committed to grandchildren

 func (s *DockerCLIBuildSuite) TestBuildOnBuildLimitedInheritance(c *testing.T) {

-	buildImageSuccessfully(c, "testonbuildtrigger1", build.WithDockerfile(`

+	cli.BuildCmd(c, "testonbuildtrigger1", build.WithDockerfile(`

 		FROM busybox

 		RUN echo "GRANDPARENT"

 		ONBUILD RUN echo "ONBUILD PARENT"

@@ -1742,11 +1742,11 @@ func (s *DockerCLIBuildSuite) TestBuildSameDockerfileWithAndWithoutCache(c *test

 		MAINTAINER dockerio

 		EXPOSE 5432

         ENTRYPOINT ["/bin/echo"]`

-	buildImageSuccessfully(c, name, build.WithDockerfile(dockerfile))

+	cli.BuildCmd(c, name, build.WithDockerfile(dockerfile))

 	id1 := getIDByName(c, name)

-	buildImageSuccessfully(c, name, build.WithDockerfile(dockerfile))

+	cli.BuildCmd(c, name, build.WithDockerfile(dockerfile))

 	id2 := getIDByName(c, name)

-	buildImageSuccessfully(c, name, build.WithoutCache, build.WithDockerfile(dockerfile))

+	cli.BuildCmd(c, name, build.WithoutCache, build.WithDockerfile(dockerfile))

 	id3 := getIDByName(c, name)

 	if id1 != id2 {

 		c.Fatal("The cache should have been used but hasn't.")

@@ -1860,13 +1860,13 @@ func (s *DockerCLIBuildSuite) TestBuildAddCurrentDirWithCache(c *testing.T) {

 		"foo": "hello",

 	}))

 	defer ctx.Close()

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id1 := getIDByName(c, name)

 	// Check that adding file invalidate cache of "ADD ."

 	if err := ctx.Add("bar", "hello2"); err != nil {

 		c.Fatal(err)

 	}

-	buildImageSuccessfully(c, name2, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name2, build.WithExternalBuildContext(ctx))

 	id2 := getIDByName(c, name2)

 	if id1 == id2 {

 		c.Fatal("The cache should have been invalided but hasn't.")

@@ -1875,7 +1875,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddCurrentDirWithCache(c *testing.T) {

 	if err := ctx.Add("foo", "hello1"); err != nil {

 		c.Fatal(err)

 	}

-	buildImageSuccessfully(c, name3, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name3, build.WithExternalBuildContext(ctx))

 	id3 := getIDByName(c, name3)

 	if id2 == id3 {

 		c.Fatal("The cache should have been invalided but hasn't.")

@@ -1886,7 +1886,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddCurrentDirWithCache(c *testing.T) {

 	if err := ctx.Add("foo", "hello1"); err != nil {

 		c.Fatal(err)

 	}

-	buildImageSuccessfully(c, name4, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name4, build.WithExternalBuildContext(ctx))

 	id4 := getIDByName(c, name4)

 	if id3 != id4 {

 		c.Fatal("The cache should have been used but hasn't.")

@@ -1904,9 +1904,9 @@ func (s *DockerCLIBuildSuite) TestBuildAddCurrentDirWithoutCache(c *testing.T) {

 		"foo": "hello",

 	}))

 	defer ctx.Close()

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id1 := getIDByName(c, name)

-	buildImageSuccessfully(c, name, build.WithoutCache, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithoutCache, build.WithExternalBuildContext(ctx))

 	id2 := getIDByName(c, name)

 	if id1 == id2 {

 		c.Fatal("The cache should have been invalided but hasn't.")

@@ -1996,11 +1996,11 @@ func (s *DockerCLIBuildSuite) TestBuildAddLocalAndRemoteFilesWithAndWithoutCache

 			"foo": "hello world",

 		}))

 	defer ctx.Close()

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id1 := getIDByName(c, name)

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 	id2 := getIDByName(c, name)

-	buildImageSuccessfully(c, name, build.WithoutCache, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithoutCache, build.WithExternalBuildContext(ctx))

 	id3 := getIDByName(c, name)

 	if id1 != id2 {

 		c.Fatal("The cache should have been used but hasn't.")

@@ -2138,7 +2138,7 @@ func (s *DockerCLIBuildSuite) TestBuildWithVolumeOwnership(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildimg"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox:latest

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox:latest

         RUN mkdir /test && chown daemon:wheel /test && chmod 0600 /test

         VOLUME /test`))

@@ -2155,10 +2155,10 @@ func (s *DockerCLIBuildSuite) TestBuildWithVolumeOwnership(c *testing.T) {

 // utilizing cache

 func (s *DockerCLIBuildSuite) TestBuildEntrypointRunCleanup(c *testing.T) {

 	const name = "testbuildcmdcleanup"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

         RUN echo "hello"`))

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `FROM busybox

         RUN echo "hello"

         ADD foo /foo

@@ -2188,11 +2188,11 @@ func (s *DockerCLIBuildSuite) TestBuildInheritance(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildinheritance"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM scratch

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM scratch

 		EXPOSE 2375`))

 	ports1 := inspectField(c, name, "Config.ExposedPorts")

-	buildImageSuccessfully(c, name, build.WithDockerfile(fmt.Sprintf(`FROM %s

+	cli.BuildCmd(c, name, build.WithDockerfile(fmt.Sprintf(`FROM %s

 		ENTRYPOINT ["/bin/echo"]`, name)))

 	res := inspectField(c, name, "Config.Entrypoint")

@@ -2216,9 +2216,9 @@ func (s *DockerCLIBuildSuite) TestBuildFails(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildOnBuild(c *testing.T) {

 	const name = "testbuildonbuild"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

 		ONBUILD RUN touch foobar`))

-	buildImageSuccessfully(c, name, build.WithDockerfile(fmt.Sprintf(`FROM %s

+	cli.BuildCmd(c, name, build.WithDockerfile(fmt.Sprintf(`FROM %s

 		RUN [ -f foobar ]`, name)))

 }

@@ -2229,7 +2229,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddToSymlinkDest(c *testing.T) {

 		makeLink = `mklink /D C:\bar C:\foo`

 	}

 	const name = "testbuildaddtosymlinkdest"

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `

 		FROM busybox

 		RUN sh -c "mkdir /foo"

@@ -2244,7 +2244,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddToSymlinkDest(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildEscapeWhitespace(c *testing.T) {

 	const name = "testbuildescapewhitespace"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

   # ESCAPE=\

   FROM busybox

   MAINTAINER "Docker \

@@ -2262,7 +2262,7 @@ func (s *DockerCLIBuildSuite) TestBuildVerifyIntString(c *testing.T) {

 	// Verify that strings that look like ints are still passed as strings

 	const name = "testbuildstringing"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`

+	cli.BuildCmd(c, name, build.WithDockerfile(`

 	FROM busybox

 	MAINTAINER 123`))

@@ -2274,7 +2274,7 @@ func (s *DockerCLIBuildSuite) TestBuildVerifyIntString(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildDockerignore(c *testing.T) {

 	const name = "testbuilddockerignore"

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `

 		FROM busybox

 		 ADD . /bla

@@ -2312,7 +2312,7 @@ dir`),

 func (s *DockerCLIBuildSuite) TestBuildDockerignoreCleanPaths(c *testing.T) {

 	const name = "testbuilddockerignorecleanpaths"

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `

         FROM busybox

         ADD . /tmp/

@@ -2326,7 +2326,7 @@ func (s *DockerCLIBuildSuite) TestBuildDockerignoreCleanPaths(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildDockerignoreExceptions(c *testing.T) {

 	const name = "testbuilddockerignoreexceptions"

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `

 		FROM busybox

 		ADD . /bla

@@ -2376,12 +2376,12 @@ func (s *DockerCLIBuildSuite) TestBuildDockerignoringDockerfile(c *testing.T) {

 		ADD . /tmp/

 		RUN sh -c "! ls /tmp/Dockerfile"

 		RUN ls /tmp/.dockerignore`

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile(".dockerignore", "Dockerfile\n"),

 	))

 	// FIXME(vdemeester) why twice ?

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile(".dockerignore", "./Dockerfile\n"),

 	))

@@ -2395,13 +2395,13 @@ func (s *DockerCLIBuildSuite) TestBuildDockerignoringRenamedDockerfile(c *testin

 		RUN ls /tmp/Dockerfile

 		RUN sh -c "! ls /tmp/MyDockerfile"

 		RUN ls /tmp/.dockerignore`

-	buildImageSuccessfully(c, name, cli.WithFlags("-f", "MyDockerfile"), build.WithBuildContext(c,

+	cli.BuildCmd(c, name, cli.WithFlags("-f", "MyDockerfile"), build.WithBuildContext(c,

 		build.WithFile("Dockerfile", "Should not use me"),

 		build.WithFile("MyDockerfile", dockerfile),

 		build.WithFile(".dockerignore", "MyDockerfile\n"),

 	))

 	// FIXME(vdemeester) why twice ?

-	buildImageSuccessfully(c, name, cli.WithFlags("-f", "MyDockerfile"), build.WithBuildContext(c,

+	cli.BuildCmd(c, name, cli.WithFlags("-f", "MyDockerfile"), build.WithBuildContext(c,

 		build.WithFile("Dockerfile", "Should not use me"),

 		build.WithFile("MyDockerfile", dockerfile),

 		build.WithFile(".dockerignore", "./MyDockerfile\n"),

@@ -2415,7 +2415,7 @@ func (s *DockerCLIBuildSuite) TestBuildDockerignoringDockerignore(c *testing.T)

 		ADD . /tmp/

 		RUN sh -c "! ls /tmp/.dockerignore"

 		RUN ls /tmp/Dockerfile`

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile(".dockerignore", ".dockerignore\n"),

 	))

@@ -2472,7 +2472,7 @@ func (s *DockerCLIBuildSuite) TestBuildDockerignoringWholeDir(c *testing.T) {

 		RUN sh -c "[[ ! -e /.gitignore ]]"

 		RUN sh -c "[[ ! -e /Makefile ]]"`

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile(".dockerignore", "*\n"),

 		build.WithFile("Makefile", "all:"),

@@ -2489,7 +2489,7 @@ func (s *DockerCLIBuildSuite) TestBuildDockerignoringOnlyDotfiles(c *testing.T)

 		RUN sh -c "[[ ! -e /.gitignore ]]"

 		RUN sh -c "[[ -f /Makefile ]]"`

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile(".dockerignore", ".*"),

 		build.WithFile("Makefile", "all:"),

@@ -2525,7 +2525,7 @@ func (s *DockerCLIBuildSuite) TestBuildDockerignoringWildTopDir(c *testing.T) {

 	// All of these should result in ignoring all files

 	for _, variant := range []string{"**", "**/", "**/**", "*"} {

-		buildImageSuccessfully(c, "noname", build.WithBuildContext(c,

+		cli.BuildCmd(c, "noname", build.WithBuildContext(c,

 			build.WithFile("Dockerfile", dockerfile),

 			build.WithFile("file1", ""),

 			build.WithFile("dir/file1", ""),

@@ -2577,7 +2577,7 @@ dir1/dir3/**

 **/dir5/file.

 `

-	buildImageSuccessfully(c, "noname", build.WithBuildContext(c,

+	cli.BuildCmd(c, "noname", build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile(".dockerignore", dockerignore),

 		build.WithFile("dir1/file0", ""),

@@ -2602,7 +2602,7 @@ dir1/dir3/**

 func (s *DockerCLIBuildSuite) TestBuildLineBreak(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildlinebreak"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM  busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM  busybox

 RUN    sh -c 'echo root:testpass \

 	> /tmp/passwd'

 RUN    mkdir -p /var/run/sshd

@@ -2613,7 +2613,7 @@ RUN    sh -c "[ "$(ls -d /var/run/sshd)" = "/var/run/sshd" ]"`))

 func (s *DockerCLIBuildSuite) TestBuildEOLInLine(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildeolinline"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM   busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM   busybox

 RUN    sh -c 'echo root:testpass > /tmp/passwd'

 RUN    echo "foo \n bar"; echo "baz"

 RUN    mkdir -p /var/run/sshd

@@ -2624,7 +2624,7 @@ RUN    sh -c "[ "$(ls -d /var/run/sshd)" = "/var/run/sshd" ]"`))

 func (s *DockerCLIBuildSuite) TestBuildCommentsShebangs(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildcomments"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

 # This is an ordinary comment.

 RUN { echo '#!/bin/sh'; echo 'echo hello world'; } > /hello.sh

 RUN [ ! -x /hello.sh ]

@@ -2638,7 +2638,7 @@ RUN [ "$(/hello.sh)" = "hello world" ]`))

 func (s *DockerCLIBuildSuite) TestBuildUsersAndGroups(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	const name = "testbuildusers"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM busybox

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM busybox

 # Make sure our defaults work

 RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)" = '0:0/root:root' ]

@@ -2715,7 +2715,7 @@ ENV    abc=def

 ENV    ghi=$abc

 RUN    [ "$ghi" = "def" ]

 `

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile("hello/docker/world", "hello"),

 	))

@@ -2785,7 +2785,7 @@ ENV    eee4 'foo'

 RUN    [ "$eee1,$eee2,$eee3,$eee4" = 'foo,foo,foo,foo' ]

 `

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile("hello/docker/world", "hello"),

 	))

@@ -2801,7 +2801,7 @@ RUN ["chmod","+x","/test"]

 RUN ["/test"]

 RUN [ "$(cat /testfile)" = 'test!' ]`

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", dockerfile),

 		build.WithFile("test", "#!/bin/sh\necho 'test!' > /testfile"),

 	))

@@ -2858,7 +2858,7 @@ RUN cat /existing-directory-trailing-slash/test/foo | grep Hi`

 	}()

 	defer ctx.Close()

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 }

 func (s *DockerCLIBuildSuite) TestBuildAddBrokenTar(c *testing.T) {

@@ -2916,7 +2916,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddNonTar(c *testing.T) {

 	const name = "testbuildaddnontar"

 	// Should not try to extract test.tar

-	buildImageSuccessfully(c, name, build.WithBuildContext(c,

+	cli.BuildCmd(c, name, build.WithBuildContext(c,

 		build.WithFile("Dockerfile", `

 		FROM busybox

 		ADD test.tar /

@@ -2971,7 +2971,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddTarXz(c *testing.T) {

 	defer ctx.Close()

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 }

 func (s *DockerCLIBuildSuite) TestBuildAddTarXzGz(c *testing.T) {

@@ -3023,7 +3023,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddTarXzGz(c *testing.T) {

 	defer ctx.Close()

-	buildImageSuccessfully(c, name, build.WithExternalBuildContext(ctx))

+	cli.BuildCmd(c, name, build.WithExternalBuildContext(ctx))

 }

 // FIXME(vdemeester) most of the from git tests could be moved to `docker/cli` e2e tests

@@ -3038,7 +3038,7 @@ func (s *DockerCLIBuildSuite) TestBuildFromGit(c *testing.T) {

 	}, true)

 	defer git.Close()

-	buildImageSuccessfully(c, name, build.WithContextPath(git.RepoURL))

+	cli.BuildCmd(c, name, build.WithContextPath(git.RepoURL))

 	res := inspectField(c, name, "Author")

 	if res != "docker" {

@@ -3057,7 +3057,7 @@ func (s *DockerCLIBuildSuite) TestBuildFromGitWithContext(c *testing.T) {

 	}, true)

 	defer git.Close()

-	buildImageSuccessfully(c, name, build.WithContextPath(fmt.Sprintf("%s#master:docker", git.RepoURL)))

+	cli.BuildCmd(c, name, build.WithContextPath(fmt.Sprintf("%s#master:docker", git.RepoURL)))

 	res := inspectField(c, name, "Author")

 	if res != "docker" {

@@ -3116,10 +3116,10 @@ func (s *DockerCLIBuildSuite) TestBuildFromRemoteTarball(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildCleanupCmdOnEntrypoint(c *testing.T) {

 	const name = "testbuildcmdcleanuponentrypoint"

-	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

+	cli.BuildCmd(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

 		CMD ["test"]

 		ENTRYPOINT ["echo"]`))

-	buildImageSuccessfully(c, name, build.WithDockerfile(fmt.Sprintf(`FROM %s

+	cli.BuildCmd(c, name, build.WithDockerfile(fmt.Sprintf(`FROM %s

 		ENTRYPOINT ["cat"]`, name)))