Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: Don't read COMMIT, BUILDTAGS, EXTRA_BUILDTAGS from env vars #4380

Merged
merged 1 commit into from
Aug 24, 2024

Conversation

rata
Copy link
Member

@rata rata commented Aug 15, 2024

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

@rata rata requested review from thaJeztah and kolyshkin August 15, 2024 14:38
@rata rata force-pushed the makefile-no-envs branch from f3cc0a4 to 99b3881 Compare August 15, 2024 14:39
@rata rata changed the title Makefile: Don't read COMMIT, BUILDTAG, EXTRA_BUILDTAGS from env vars Makefile: Don't read COMMIT, BUILDTAGS, EXTRA_BUILDTAGS from env vars Aug 15, 2024
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member

🙈 needs a rebase

We recently switched VERSION to be read from env vars (opencontainers#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 opencontainers#4370, we discussed to consider doing the same for
these variables too
(opencontainers#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]>
@rata rata force-pushed the makefile-no-envs branch from 99b3881 to 767bc00 Compare August 24, 2024 12:50
@rata
Copy link
Member Author

rata commented Aug 24, 2024

Rebased now :)

@AkihiroSuda AkihiroSuda merged commit 346b818 into opencontainers:main Aug 24, 2024
42 checks passed
@lifubang lifubang mentioned this pull request Aug 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants