mkctr: add --env flag, fix volume support #32
Merged
Conversation
This file contains hidden or 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 adds support for setting environment variables and fixes two problems with volume support (merged in #27): * if no volumes were specified, it added a bogus "" (empty string) volume which made docker fail to run the container * if no args were given, volumes were omitted This also pulls out some common code into a new withPlatformPrefix helper, and removes some log spam by silently skipping over "unknown" OS layers in the source image when discovering what OSes to build for. Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
raggi
approved these changes
Jan 5, 2026
| // Apply the merged env vars | ||
| return mutateConfig(img, func(c *v1.Config) error { | ||
| c.Env = nil | ||
| for _, k := range slices.Sorted(maps.Keys(envMap)) { |
Member
Author
There was a problem hiding this comment.
might as well produce deterministic output, I figured?
I was too lazy to go check whether another layer already did this normalization
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This adds support for setting environment variables and fixes two problems
with volume support (merged in #27):
which made docker fail to run the container
This also pulls out some common code into a new withPlatformPrefix helper,
and removes some log spam by silently skipping over "unknown" OS layers
in the source image when discovering what OSes to build for.