@@ -1,4 +1,5 @@

 bundles

+integration-cli/bundles

 .gopath

 vendor/pkg

 .go-pkg-cache

@@ -10,6 +10,9 @@ export DOCKER_INCREMENTAL_BINARY

 DOCKER_OSARCH := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKER_ENGINE_OSARCH:-$$DOCKER_CLIENT_OSARCH}')

 DOCKERFILE := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKERFILE}')

+DOCKER_GITCOMMIT := $(shell git rev-parse --short HEAD || echo unsupported)

+export DOCKER_GITCOMMIT

+

 # env vars passed through directly to Docker's build scripts

 # to allow things like `make KEEPBUNDLE=1 binary` easily

 # `project/PACKAGERS.md` have some limited documentation of some of these

@@ -70,7 +70,9 @@ DEFAULT_BUNDLES=(

 VERSION=$(< ./VERSION)

 ! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')

-if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; then

+if [ "$DOCKER_GITCOMMIT" ]; then

+	GITCOMMIT="$DOCKER_GITCOMMIT"

+elif command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; then

 	GITCOMMIT=$(git rev-parse --short HEAD)

 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then

 		GITCOMMIT="$GITCOMMIT-unsupported"

@@ -83,8 +85,7 @@ if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; the

 		git status --porcelain --untracked-files=no

 		echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

 	fi

-elif [ "$DOCKER_GITCOMMIT" ]; then

-	GITCOMMIT="$DOCKER_GITCOMMIT"

+	! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') &> /dev/null

 else

 	echo >&2 'error: .git directory missing and DOCKER_GITCOMMIT not specified'

 	echo >&2 '  Please either build with the .git directory accessible, or specify the'