diff --git a/build/common.sh b/build/common.sh index 9ec643b1d98..67b0a4927d8 100755 --- a/build/common.sh +++ b/build/common.sh @@ -178,7 +178,8 @@ function kube::build::verify_prereqs() { fi fi - KUBE_ROOT_HASH=$(kube::build::short_hash "${HOSTNAME:-}:${KUBE_ROOT}") + KUBE_GIT_BRANCH=$(git symbolic-ref --short -q HEAD 2>/dev/null || true) + KUBE_ROOT_HASH=$(kube::build::short_hash "${HOSTNAME:-}:${KUBE_ROOT}:${KUBE_GIT_BRANCH}") KUBE_BUILD_IMAGE_TAG_BASE="build-${KUBE_ROOT_HASH}" KUBE_BUILD_IMAGE_TAG="${KUBE_BUILD_IMAGE_TAG_BASE}-${KUBE_BUILD_IMAGE_VERSION}" KUBE_BUILD_IMAGE="${KUBE_BUILD_IMAGE_REPO}:${KUBE_BUILD_IMAGE_TAG}"