1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Fix detection of git commit during build from tarball

Distro packagers will often use the tarball to build a package and have
the build script for the package in git. To avoid that the docker build
script picks up the git commit from the distro repo we also check for a
directory named .git before check for -unsupported builds.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
This commit is contained in:
Natanael Copa 2016-04-14 17:29:12 +02:00
parent 900f06ae3a
commit 355ad33087

View file

@ -79,7 +79,7 @@ DEFAULT_BUNDLES=(
) )
VERSION=$(< ./VERSION) VERSION=$(< ./VERSION)
if command -v git &> /dev/null && git rev-parse &> /dev/null; then if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; then
GITCOMMIT=$(git rev-parse --short HEAD) GITCOMMIT=$(git rev-parse --short HEAD)
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
GITCOMMIT="$GITCOMMIT-unsupported" GITCOMMIT="$GITCOMMIT-unsupported"