Merge pull request #1017 from WeiZhang555/version-dirty

Append string "-dirty" to version if git repo is unclean
This commit is contained in:
Mrunal Patel 2016-09-07 12:24:19 -07:00 committed by GitHub
commit c6b3e79d30
1 changed files with 2 additions and 1 deletions

View File

@ -12,7 +12,8 @@ TEST_DOCKERFILE := script/test_Dockerfile
BUILDTAGS := seccomp
RUNC_BUILD_PATH := /go/src/github.com/opencontainers/runc/runc
RUNC_INSTANCE := runc_dev
COMMIT := $(shell git rev-parse HEAD 2> /dev/null || true)
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
RUNC_LINK := $(CURDIR)/Godeps/_workspace/src/github.com/opencontainers/runc
export GOPATH := $(CURDIR)/Godeps/_workspace