Merge pull request #16147 from tiborvass/refactor-builder

Refactor builder with new Go interfaces

integration-cli/docker_api_build_test.go

@@ -39,7 +39,7 @@ func (s *DockerSuite) TestBuildApiDockerfilePath(c *check.C) {
 		c.Fatal(err)
 	}
 
-	if !strings.Contains(string(out), "must be within the build context") {
+	if !strings.Contains(string(out), "Forbidden path outside the build context") {
 		c.Fatalf("Didn't complain about leaving build context: %s", out)
 	}
 }

integration-cli/docker_cli_build_test.go

@@ -18,7 +18,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/docker/docker/builder/command"
+	"github.com/docker/docker/builder/dockerfile/command"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/go-check/check"