Skip to content

Commit 767bc00

Browse files
committed
Makefile: Don't read COMMIT, BUILDTAG, EXTRA_BUILDTAGS from env vars
We recently switched VERSION to be read from env vars (#4270). This broke several projects, as they were building runc and using a `VERSION` env var for, e.g. the containerd version. When fixing that in #4370, we discussed to consider doing the same for these variables too (#4370 (review)). Let's stop reading them from env vars, as it is very easy to do it by mistake (e.g. compile runc and define a COMMIT env var, not to override the commit shown in `runc --version`) and users that want can still override them if they want to. For example, with: make EXTRA_BUILDTAGS=runc_nodmz Signed-off-by: Rodrigo Campos <[email protected]>
1 parent a41b62a commit 767bc00

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
1414
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
1515
RUNC_IMAGE := runc_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
1616
PROJECT := github.com/opencontainers/runc
17-
BUILDTAGS ?= seccomp urfave_cli_no_docs
17+
EXTRA_BUILDTAGS :=
18+
BUILDTAGS := seccomp urfave_cli_no_docs
1819
BUILDTAGS += $(EXTRA_BUILDTAGS)
1920

20-
COMMIT ?= $(shell git describe --dirty --long --always)
21+
COMMIT := $(shell git describe --dirty --long --always)
2122
EXTRA_VERSION :=
2223
VERSION := $(shell cat ./VERSION)$(EXTRA_VERSION)
2324
LDFLAGS_COMMON := -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION)

0 commit comments

Comments
 (0)