Skip to content
Permalink
Browse files

Merge pull request #2071 from judu/patch-1

Allow to define `COMMIT` by env
  • Loading branch information...
crosbymichael committed Jun 11, 2019
2 parents b4a0b1d + 6770c86 commit 6cc515888830787a93d82138821f0309ad970640
Showing with 1 addition and 1 deletion.
  1. +1 −1 Makefile
@@ -14,7 +14,7 @@ RUNC_IMAGE := runc_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
PROJECT := github.com/opencontainers/runc
BUILDTAGS ?= seccomp
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}")
COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")

MAN_DIR := $(CURDIR)/man/man8
MAN_PAGES = $(shell ls $(MAN_DIR)/*.8)

0 comments on commit 6cc5158

Please sign in to comment.
You can’t perform that action at this time.