Tweak and document disabling Docker build integration #5365
+51
−45
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
|
This pull request has merge conflicts that need to be resolved. |
twz123
force-pushed
the
make-disable-docker-integration
branch
2 times, most recently
from
094ccbd to
be8b5e6
Compare
|
This pull request has merge conflicts that need to be resolved. |
The previous sentinel value of "false" may have given the impression that "true" is the correct value to enable Docker build integration. Also, "false" is actually an executable provided by coreutils. An empty string can never point to a potentially executable file, and won't give the impression that DOCKER is some sort of boolean variable. Signed-off-by: Tom Wieczorek <[email protected]>
Don't default EMBEDDED_BINS_BUILDMODE to none when disabling Docker integration. This makes it clear that the binaries can't be built without it, at the moment. Inline the K0S_BUILD_IMAGE_FILE variable and replace it with the more generic GO_ENV_REQUISITES. Document the new variable in the README. Signed-off-by: Tom Wieczorek <[email protected]>
twz123
force-pushed
the
make-disable-docker-integration
branch
from
be8b5e6 to
8ff47f6
Compare
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.
Description
Don't default
EMBEDDED_BINS_BUILDMODEto none when disabling Docker integration. This makes it clear that the binaries can't be built without it, at the moment. Inline theK0S_BUILD_IMAGE_FILEvariable and replace it with the more genericGO_ENV_REQUISITES. Use the empty string to disable Docker integration: The previous sentinel value of "false" may have given the impression that "true" is the correct value to enable Docker build integration. Also, "false" is actually an executable provided by coreutils. An empty string can never point to a potentially executable file, and won't give the impression that DOCKER is some sort of boolean variable.Document the new build variables in the README.
Follow-up to:
Type of change
How Has This Been Tested?
Checklist: