@@ -996,6 +996,7 @@ func deepCopy_api_CustomBuildStrategy(in buildapi.CustomBuildStrategy, out *buil

 		out.Env = nil

 	}

 	out.ExposeDockerSocket = in.ExposeDockerSocket

+	out.ForcePull = in.ForcePull

 	return nil

 }

@@ -244,6 +244,10 @@ type CustomBuildStrategy struct {

 	// inside the Docker container.

 	// TODO: Allow admins to enforce 'false' for this option

 	ExposeDockerSocket bool

+

+	// ForcePull describes if the controller should configure the build pod to always pull the images

+	// for the builder or only pull if it is not present locally

+	ForcePull bool

 }

 // DockerBuildStrategy defines input parameters specific to Docker build.

@@ -229,6 +229,10 @@ type CustomBuildStrategy struct {

 	// inside the Docker container.

 	// TODO: Allow admins to enforce 'false' for this option

 	ExposeDockerSocket bool `json:"exposeDockerSocket,omitempty" description:"allow running Docker commands (and build Docker images) from inside the container"`

+

+	// ForcePull describes if the controller should configure the build pod to always pull the images

+	// for the builder or only pull if it is not present locally

+	ForcePull bool `json:"forcePull,omitempty" description:"forces pulling of builder image from remote registry if true"`

 }

 // DockerBuildStrategy defines input parameters specific to Docker build.

@@ -220,6 +220,10 @@ type CustomBuildStrategy struct {

 	// inside the Docker container.

 	// TODO: Allow admins to enforce 'false' for this option

 	ExposeDockerSocket bool `json:"exposeDockerSocket,omitempty"`

+

+	// ForcePull describes if the controller should configure the build pod to always pull the images

+	// for the builder or only pull if it is not present locally

+	ForcePull bool `json:"forcePull,omitempty" description:"forces pulling of builder image from remote registry if true"`

 }

 // DockerBuildStrategy defines input parameters specific to Docker build.

@@ -77,7 +77,12 @@ func (bs *CustomBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod,

 		return nil, err

 	}

-	pod.Spec.Containers[0].ImagePullPolicy = kapi.PullIfNotPresent

+	if !strategy.ForcePull {

+		pod.Spec.Containers[0].ImagePullPolicy = kapi.PullIfNotPresent

+	} else {

+		glog.V(2).Infof("ForcePull is enabled for %s build", build.Name)

+		pod.Spec.Containers[0].ImagePullPolicy = kapi.PullAlways

+	}

 	pod.Spec.Containers[0].Resources = build.Spec.Resources

 	if strategy.ExposeDockerSocket {

@@ -17,7 +17,7 @@ func TestCustomCreateBuildPod(t *testing.T) {

 		Codec: latest.Codec,

 	}

-	expectedBad := mockCustomBuild()

+	expectedBad := mockCustomBuild(false)

 	expectedBad.Spec.Strategy.CustomStrategy.From = kapi.ObjectReference{

 		Kind: "DockerImage",

 		Name: "",

@@ -26,7 +26,7 @@ func TestCustomCreateBuildPod(t *testing.T) {

 		t.Errorf("Expected error when Image is empty, got nothing")

 	}

-	expected := mockCustomBuild()

+	expected := mockCustomBuild(false)

 	actual, err := strategy.CreateBuildPod(expected)

 	if err != nil {

 		t.Fatalf("Unexpected error: %v", err)

@@ -83,9 +83,19 @@ func TestCustomCreateBuildPod(t *testing.T) {

 			t.Errorf("Expected %s variable to be set", name)

 		}

 	}

+

+	expectedForcePull := mockCustomBuild(true)

+	actualForcePull, fperr := strategy.CreateBuildPod(expectedForcePull)

+	if fperr != nil {

+		t.Fatalf("Unexpected error: %v", fperr)

+	}

+	containerForcePull := actualForcePull.Spec.Containers[0]

+	if containerForcePull.ImagePullPolicy != kapi.PullAlways {

+		t.Errorf("Expected %v, got %v", kapi.PullAlways, container.ImagePullPolicy)

+	}

 }

-func mockCustomBuild() *buildapi.Build {

+func mockCustomBuild(forcePull bool) *buildapi.Build {

 	return &buildapi.Build{

 		ObjectMeta: kapi.ObjectMeta{

 			Name: "customBuild",

@@ -116,6 +126,7 @@ func mockCustomBuild() *buildapi.Build {

 						{Name: "FOO", Value: "BAR"},

 					},

 					ExposeDockerSocket: true,

+					ForcePull:          forcePull,

 				},

 			},

 			Output: buildapi.BuildOutput{

@@ -68,7 +68,7 @@ func isVolumeSourceEmpty(volumeSource kapi.VolumeSource) bool {

 }

 func TestSetupBuildEnvEmpty(t *testing.T) {

-	build := mockCustomBuild()

+	build := mockCustomBuild(false)

 	containerEnv := []kapi.EnvVar{

 		{Name: "BUILD", Value: ""},

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

@@ -289,6 +289,9 @@ func describeCustomStrategy(s *buildapi.CustomBuildStrategy, out *tabwriter.Writ

 	if s.ExposeDockerSocket {

 		formatString(out, "Expose Docker Socket", "yes")

 	}

+	if s.ForcePull {

+		formatString(out, "Force Pull", "yes")

+	}

 	if s.PullSecret != nil {

 		formatString(out, "Pull Secret Name", s.PullSecret.Name)

 	}