Allow for the onbuild trigger or not

Some builds would like to copy the source themselves.

Dockerfile

@@ -14,6 +14,4 @@ COPY build.sh /
 
 ENTRYPOINT ["/build_environment.sh"]
 
-ONBUILD COPY ./ /src
-
 CMD ["/build.sh"]

Dockerfile.builder

@@ -0,0 +1,6 @@
+FROM safenetlabs/golang:1.4.2
+MAINTAINER SafeNet Labs
+
+ONBUILD COPY ./ /src
+
+CMD ["/build.sh"]

build.sh

@@ -3,13 +3,13 @@
 tagName=$1
 
 # Compile statically linked version of package
-echo "Building $pkgName"
-`CGO_ENABLED=${CGO_ENABLED:-0} go build -a --installsuffix cgo --ldflags="${LDFLAGS:--s}" $pkgName`
+echo "Building $PKG_NAME"
+`CGO_ENABLED=${CGO_ENABLED:-0} go build -a --installsuffix cgo --ldflags="${LDFLAGS:--s}" $PKG_NAME`
 
 if [ -e "/var/run/docker.sock" ] && [ -e "./Dockerfile" ];
 then
   # Grab the last segment from the package name
-  name=${pkgName##*/}
+  name=${PKG_NAME##*/}
 
   # Default TAG_NAME to package name if not set explicitly
   tagName=${tagName:-"$name":latest}

build_environment.sh

@@ -7,21 +7,21 @@ then
 fi
 
 # Grab Go package name
-pkgName="$(go list -e -f '{{.ImportComment}}' 2>/dev/null || true)"
+PKG_NAME="$(go list -e -f '{{.ImportComment}}' 2>/dev/null || true)"
 
-if [ -z "$pkgName" ];
+if [ -z "$PKG_NAME" ];
 then
   echo "Error: Must add canonical import path to root package"
   exit 992
 fi
 
-export pkgName
+export PKG_NAME
 
 # Grab just first path listed in GOPATH
 goPath="${GOPATH%%:*}"
 
 # Construct Go package path
-pkgPath="$goPath/src/$pkgName"
+pkgPath="$goPath/src/$PKG_NAME"
 
 # Set-up src directory tree in GOPATH
 mkdir -p "$(dirname "$pkgPath")"
@@ -33,9 +33,13 @@ if [ -e "$pkgPath/Godeps/_workspace" ];
 then
   # Add local godeps dir to GOPATH
   GOPATH=$pkgPath/Godeps/_workspace:$GOPATH
+  # Add godep bin to path
+  PATH=$PATH:$pkgPath/Godeps/_workspace/bin
 else
   # Get all package dependencies
   go get -t -d -v ./...
 fi
 
+cd $pkgPath
+
 exec "$@"