@@ -8,4 +8,5 @@ set -o nounset

 set -o pipefail

 origin_path="src/github.com/openshift/origin"

-docker run -v ${GOPATH}/${origin_path}:/go/${origin_path} openshift/origin-release /opt/bin/build.sh

+docker run --rm -v ${GOPATH}/${origin_path}:/go/${origin_path} \

+  openshift/origin-release /usr/bin/openshift-origin-build.sh $@

@@ -7,7 +7,6 @@ set -o nounset

 set -o pipefail

 GO_VERSION=($(go version))

-echo "Detected go version: $(go version)"

 if [[ ${GO_VERSION[2]} != "go1.3"* && ${GO_VERSION[2]} != "go1.4"* ]]; then

   echo "Unknown go version, skipping gofmt."

@@ -10,10 +10,9 @@ if ! which golint &>/dev/null; then

 fi

 GO_VERSION=($(go version))

-echo "Detected go version: $(go version)"

-if [[ ${GO_VERSION[2]} != "go1.2" && ${GO_VERSION[2]} != "go1.3.1" && ${GO_VERSION[2]} != "go1.3.3" ]]; then

-  echo "Unknown go version, skipping golint."

+if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3') ]]; then

+  echo "Unknown go version '${GO_VERSION}', skipping golint."

   exit 0

 fi

@@ -27,9 +26,16 @@ bad_files=""

 if [ "$arg" == "-m" ]; then

   head=$(git rev-parse --short HEAD | xargs echo -n)

-  bad_files=$(git diff-tree --no-commit-id --name-only -r master..$head | \

+  set +e

+  modified_files=$(git diff-tree --no-commit-id --name-only -r master..$head | \

     grep "^pkg" | grep ".go$" | grep -v "bindata.go$" | grep -v "Godeps" | \

-    grep -v "third_party" | xargs golint)

+    grep -v "third_party")

+  if [ -n "${modified_files}" ]; then

+    echo -e "Checking modified files: ${modified_files}\n"

+    for f in $modified_files; do golint $f; done

+    echo

+  fi

+  set -e

 else

   find_files() {

     find . -not \( \

@@ -11,7 +11,7 @@ RUN yum install -y hg golang golang-pkg-darwin golang-pkg-windows && yum clean a

 ENV GOPATH /go

 # Get the code coverage tool and godep

-RUN go get code.google.com/p/go.tools/cmd/cover github.com/tools/godep

+RUN go get code.google.com/p/go.tools/cmd/cover github.com/tools/godep github.com/golang/lint/golint

 # Mark this as a os-build container

 RUN touch /os-build-image

@@ -24,7 +24,8 @@ ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin

 ENV OS_VERSION_FILE /go/src/github.com/openshift/origin/os-version-defs

-ADD build.sh /opt/bin/build.sh

+# Allows building Origin sources mounted using volume

+ADD openshift-origin-build.sh /usr/bin/openshift-origin-build.sh

 # Expect a tar with the source of OpenShift Origin (and /os-version-defs in the root)

 CMD tar mxzf - && hack/build-cross.sh

deleted file mode 100755

@@ -1,10 +0,0 @@

-#!/bin/bash -e

-

-cat <<EOF > /tmp/build_script.sh

-#!/bin/bash -ex

-cd \${GOPATH}/src/github.com/openshift/origin

-OS_VERSION_FILE="" ./hack/build-go.sh && chmod -R go+rw {Godeps/_workspace/pkg,_output}

-EOF

-

-chmod +x /tmp/build_script.sh

-exec /tmp/build_script.sh

new file mode 100755

@@ -0,0 +1,26 @@

+#!/bin/bash

+

+os_dir="${GOPATH}/src/github.com/openshift/origin"

+build_script_path=`mktemp /tmp/build.XXX.sh`

+

+cat <<EOF > ${build_script_path}

+#!/bin/bash -e

+cd ${os_dir}

+OS_VERSION_FILE="" ./hack/build-go.sh && chmod -R go+rw {Godeps/_workspace/pkg,_output}

+EOF

+

+echo "++ Checking for gofmt errors"

+./hack/verify-gofmt.sh

+if [ "$?" != "0" ]; then

+  echo "Fix the gofmt errors above and then run this command again."

+  exit 1

+fi

+

+if [ "$1" == "--check" ]; then

+  echo "++ Checking for golint errors"

+  pushd ${os_dir} >/dev/null

+  ./hack/verify-golint.sh -m

+  popd >/dev/null

+fi

+

+exec sh ${build_script_path}