Merge pull request #13235 from bparees/dockerbuild_networkmode

Merged by openshift-bot

Author: OpenShift Bot

pkg/build/Godeps/Godeps.json

@@ -24,7 +24,6 @@ import (
 	bld "github.com/openshift/origin/pkg/build/builder"
 	"github.com/openshift/origin/pkg/build/builder/cmd/scmauth"
 	"github.com/openshift/origin/pkg/client"
-	dockerutil "github.com/openshift/origin/pkg/cmd/util/docker"
 	"github.com/openshift/origin/pkg/generate/git"
 	"github.com/openshift/origin/pkg/version"
 )
@@ -73,7 +72,7 @@ func newBuilderConfigFromEnvironment(out io.Writer) (*builderConfig, error) {
 
 	// dockerClient and dockerEndpoint (DOCKER_HOST)
 	// usually not set, defaults to docker socket
-	cfg.dockerClient, cfg.dockerEndpoint, err = dockerutil.NewHelper().GetClient()
+	cfg.dockerClient, cfg.dockerEndpoint, err = bld.GetDockerClient()
 	if err != nil {
 		return nil, fmt.Errorf("no Docker configuration defined: %v", err)
 	}

pkg/build/Godeps/Readme

@@ -354,6 +354,7 @@ func (d *DockerBuilder) dockerBuild(dir string, tag string, secrets []api.Secret
 		NoCache:        noCache,
 		Pull:           forcePull,
 		BuildArgs:      buildArgs,
+		NetworkMode:    string(getDockerNetworkMode()),
 	}
 
 	if d.cgLimits != nil {

pkg/build/builder/cmd/builder.go

@@ -362,3 +362,15 @@ func newDigestWriter() *digestWriter {
 	})
 	return &dw
 }
+
+// GetDockerClient returns a valid Docker client, the address of the client, or an error
+// if the client couldn't be created.
+func GetDockerClient() (client *docker.Client, endpoint string, err error) {
+	client, err = docker.NewClientFromEnv()
+	if len(os.Getenv("DOCKER_HOST")) > 0 {
+		endpoint = os.Getenv("DOCKER_HOST")
+	} else {
+		endpoint = "unix:///var/run/docker.sock"
+	}
+	return
+}