builder: do not set network.host entitlement flag if already set in buildkitd conf #2685
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…uildkitd conf Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
|
@tonistiigi As follow-up I think it would make sense to merge insecure entitlements from flags and configuration in BuildKit https://github.com/moby/buildkit/blob/3a7055008a5e58a2abbe0e0c21c919d9e014e062/cmd/buildkitd/main.go#L583-L584. WDYT? Didn't find any specific discussion around current behavior https://github.com/moby/buildkit/pull/570/files#diff-fb243a9185f7d24f7bfdf25097d6128f1b29b1a304bfc13d360667f8358551f6R375-R376 |
tonistiigi
approved these changes
Sep 11, 2024
|
v0.17.1 for this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
follow-up #2683 (comment)
On container builder creation, it's possible to define buildkitd configuration path that will injected and used inside the container.
If insecure-entitlements opts are set in this configuration they will be skipped because we are always setting the
--allow-insecure-entitlement network.host#2266 if user does not set it explicitly and buildkitd overrides configuration values with flags: https://github.com/moby/buildkit/blob/3a7055008a5e58a2abbe0e0c21c919d9e014e062/cmd/buildkitd/main.go#L583-L584.With this change we are now detecting if
network.hostinsecure entitlement is set within the buildkitd configuration and skip setting--allow-insecure-entitlement network.hostflag.cc @dvdksn