Merge pull request #145 from mlaventure/fix-makefile-generated-container-name

Add missing GIT_BRANCH variable to Makefile
This commit is contained in:
Michael Crosby 2016-03-21 13:55:31 -07:00
commit 9a9dc2e7e1

View file

@ -1,6 +1,7 @@
BUILDTAGS= BUILDTAGS=
GIT_COMMIT := $(shell git rev-parse HEAD 2> /dev/null || true) GIT_COMMIT := $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null)
LDFLAGS := -X github.com/docker/containerd.GitCommit=${GIT_COMMIT} ${LDFLAGS} LDFLAGS := -X github.com/docker/containerd.GitCommit=${GIT_COMMIT} ${LDFLAGS}