@@ -13,4 +13,4 @@

 FROM openshift/origin

 ENV HOME /root

-ENTRYPOINT ["/usr/bin/openshift-docker-build", "--loglevel=5"]

+ENTRYPOINT ["/usr/bin/openshift-docker-build"]

@@ -13,4 +13,4 @@

 FROM openshift/origin

 ENV HOME /root

-ENTRYPOINT ["/usr/bin/openshift-sti-build", "--loglevel=5"]

+ENTRYPOINT ["/usr/bin/openshift-sti-build"]

@@ -1,10 +1,13 @@

 package strategy

 import (

+	"fmt"

+

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 )

 // DockerBuildStrategy creates a Docker build using a Docker builder image.

@@ -37,6 +40,7 @@ func (bs *DockerBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod,

 					Env: []kapi.EnvVar{

 						{Name: "BUILD", Value: string(data)},

 					},

+					Command: []string{"--loglevel=" + fmt.Sprintf("%d", cmdutil.GetLogLevel())},

 					// TODO: run unprivileged https://github.com/openshift/origin/issues/662

 					Privileged: true,

 				},

@@ -36,7 +36,7 @@ func TestDockerCreateBuildPod(t *testing.T) {

 		t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)

 	}

 	if len(container.Env) != 1 {

-		t.Fatalf("Expected 1 elements in Env table, got %d", len(container.Env))

+		t.Fatalf("Expected 1 element in Env table, got %d", len(container.Env))

 	}

 	buildJSON, _ := v1beta1.Codec.Encode(expected)

 	errorCases := map[int][]string{

@@ -1,12 +1,14 @@

 package strategy

 import (

+	"fmt"

 	"io/ioutil"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 )

 // STIBuildStrategy creates STI(source to image) builds

@@ -42,11 +44,12 @@ func (bs *STIBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod, er

 	containerEnv := []kapi.EnvVar{

 		{Name: "BUILD", Value: string(data)},

 		{Name: "SOURCE_REPOSITORY", Value: build.Parameters.Source.Git.URI},

+		{Name: "BUILD_LOGLEVEL", Value: fmt.Sprintf("%d", cmdutil.GetLogLevel())},

 	}

 	strategy := build.Parameters.Strategy.STIStrategy

 	if len(strategy.Env) > 0 {

-		containerEnv = append(containerEnv, strategy.Env...)

+		mergeEnvWithoutDuplicates(strategy.Env, &containerEnv)

 	}

 	pod := &kapi.Pod{

@@ -62,6 +65,7 @@ func (bs *STIBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod, er

 					Env:   containerEnv,

 					// TODO: run unprivileged https://github.com/openshift/origin/issues/662

 					Privileged: true,

+					Command:    []string{"--loglevel=" + getContainerVerbosity(containerEnv)},

 				},

 			},

 			RestartPolicy: kapi.RestartPolicyNever,

@@ -41,8 +41,8 @@ func TestSTICreateBuildPod(t *testing.T) {

 	if actual.Spec.RestartPolicy != kapi.RestartPolicyNever {

 		t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)

 	}

-	if len(container.Env) != 3 {

-		t.Fatalf("Expected 3 elements in Env table, got %d", len(container.Env))

+	if len(container.Env) != 4 {

+		t.Fatalf("Expected 4 elements in Env table, got %d", len(container.Env))

 	}

 	found := false

 	for _, v := range container.Env {

@@ -107,3 +107,38 @@ func setupDockerSecrets(pod *kapi.Pod, pushSecret string) {

 		{Name: "PULL_DOCKERCFG_PATH", Value: filepath.Join(volumeMount.MountPath, pushSecret)},

 	}...)

 }

+

+// mergeEnvWithoutDuplicates merges two environment lists without having

+// duplicate items in the output list.

+func mergeEnvWithoutDuplicates(source []kapi.EnvVar, output *[]kapi.EnvVar) {

+	type sourceMapItem struct {

+		index int

+		value string

+	}

+	// Convert source to Map for faster access

+	sourceMap := make(map[string]sourceMapItem)

+	for i, env := range source {

+		sourceMap[env.Name] = sourceMapItem{i, env.Value}

+	}

+	result := *output

+	for i, env := range result {

+		// If the value exists in output, override it and remove it

+		// from the source list

+		if v, found := sourceMap[env.Name]; found {

+			result[i].Value = v.value

+			source = append(source[:v.index], source[v.index+1:]...)

+		}

+	}

+	*output = append(result, source...)

+}

+

+// getContainerVerbosity returns the defined BUILD_LOGLEVEL value

+func getContainerVerbosity(containerEnv []kapi.EnvVar) (verbosity string) {

+	for _, env := range containerEnv {

+		if env.Name == "BUILD_LOGLEVEL" {

+			verbosity = env.Value

+			break

+		}

+	}

+	return

+}

@@ -99,3 +99,26 @@ func TestSetupBuildEnvFails(t *testing.T) {

 		t.Errorf("unexpected non-error: %v", err)

 	}

 }

+

+func TestMergeEnvWithoutDuplicates(t *testing.T) {

+	input := []kapi.EnvVar{

+		{Name: "foo", Value: "bar"},

+		{Name: "input", Value: "inputVal"},

+	}

+	output := []kapi.EnvVar{

+		{Name: "foo", Value: "test"},

+	}

+

+	mergeEnvWithoutDuplicates(input, &output)

+

+	if len(output) != 2 {

+		t.Errorf("Expected output to contain input items len!=2 (%d)", len(output))

+	}

+

+	if output[0].Name != "foo" {

+		t.Errorf("Expected output to have env 'foo', got %+v", output[0])

+	}

+	if output[0].Value != "bar" {

+		t.Errorf("Expected output env 'foo' to have value 'bar', got %+v", output[0])

+	}

+}

new file mode 100644

@@ -0,0 +1,13 @@

+package util

+

+import "github.com/golang/glog"

+

+// GetLogLevel returns the current glog log level

+func GetLogLevel() (level int) {

+	for level = 5; level >= 0; level-- {

+		if glog.V(glog.Level(level)) == true {

+			break

+		}

+	}

+	return

+}