Fix environment variable replacement in image configuration #728
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.
The
MergeImageConfigfunction was incorrectly appending environment variables instead of replacing them when merging image configurations. This caused duplicate environment variables likePATHto appear in the final container image.Problem
When a user specified environment variables in the image section of a dalec spec:
And the base image already had
PATH=/usr/bin:/bin, the result would contain both:PATH=/usr/bin:/bin(from base image)PATH=/custom/bin:/usr/bin(from spec)This happened because the environment variable matching logic was comparing the full string (
"PATH=/usr/bin:/bin") instead of just the variable name ("PATH").Solution
Modified the
MergeImageConfigfunction to:=) for proper matching usingstrings.Cut=signsExample
Before the fix:
After the fix:
The fix includes comprehensive tests covering replacement scenarios, appending new variables, and handling edge cases. Updated to use
strings.Cutfor cleaner, more idiomatic string parsing.Fixes #456.
💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.