@@ -56,7 +56,8 @@ func NewDockerBuilder(dockerClient DockerClient, buildsClient client.BuildInterf

 // Build executes a Docker build

 func (d *DockerBuilder) Build() error {

-	if d.build.Spec.Source.Git == nil && d.build.Spec.Source.Binary == nil && d.build.Spec.Source.Dockerfile == nil && d.build.Spec.Source.Images == nil {

+	if d.build.Spec.Source.Git == nil && d.build.Spec.Source.Binary == nil &&

+		d.build.Spec.Source.Dockerfile == nil && d.build.Spec.Source.Images == nil {

 		return fmt.Errorf("must provide a value for at least one of source, binary, images, or dockerfile")

 	}

 	var push bool

@@ -164,7 +164,7 @@ func dockerRun(client DockerClient, createOpts docker.CreateContainerOptions, lo

 		return fmt.Errorf("create container %q: %v", createOpts.Name, err)

 	}

-	containerName := containerNameOrID(c)

+	containerName := getContainerNameOrID(c)

 	removeContainer := func() {

 		glog.V(4).Infof("Removing container %q ...", containerName)

@@ -204,7 +204,7 @@ func dockerRun(client DockerClient, createOpts docker.CreateContainerOptions, lo

 	return interrupt.New(nil, removeContainer).Run(startWaitContainer)

 }

-func containerNameOrID(c *docker.Container) string {

+func getContainerNameOrID(c *docker.Container) string {

 	if c.Name != "" {

 		return c.Name

 	}

@@ -335,7 +335,7 @@ func extractSourceFromImage(dockerClient DockerClient, image, buildDir string, i

 	exists := true

 	if !forcePull {

 		_, err := dockerClient.InspectImage(image)

-		if err != nil && err == docker.ErrNoSuchImage {

+		if err == docker.ErrNoSuchImage {

 			exists = false

 		} else if err != nil {

 			return err

@@ -93,8 +93,6 @@ func (s *S2IBuilder) Build() error {

 		return errors.New("the source to image builder must be used with the source strategy")

 	}

-	var push bool

-

 	contextDir := filepath.Clean(s.build.Spec.Source.ContextDir)

 	if contextDir == "." || contextDir == "/" {

 		contextDir = ""

@@ -121,6 +119,8 @@ func (s *S2IBuilder) Build() error {

 		contextDir: contextDir,

 		tmpDir:     tmpDir,

 	}

+

+	var push bool

 	// if there is no output target, set one up so the docker build logic

 	// (which requires a tag) will still work, but we won't push it at the end.

 	if s.build.Spec.Output.To == nil || len(s.build.Spec.Output.To.Name) == 0 {