fix: set MagicDir to tempdir when performing cache probe #48
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
dannykopping
approved these changes
Sep 9, 2024
mtojek
reviewed
Sep 9, 2024
Can't build until the linked envbuilder PRs are merged :-) |
mafredri
approved these changes
Sep 10, 2024
| @@ -34,7 +35,9 @@ func GetRemoteImage(imgRef string) (v1.Image, error) { | |||
| // ExtractEnvbuilderFromImage reads the image located at imgRef and extracts | |||
| // MagicBinaryLocation to destPath. | |||
| func ExtractEnvbuilderFromImage(ctx context.Context, imgRef, destPath string) error { | |||
| needle := filepath.Clean(constants.MagicBinaryLocation)[1:] // skip leading '/' | |||
| var o eboptions.Options | |||
| o.SetDefaults() | |||
There was a problem hiding this comment.
(envbuilder review: Usage here might be nicer with o := eboptions.Defaults().)
| @@ -467,6 +466,8 @@ func runCacheProbe(ctx context.Context, builderImage string, opts eboptions.Opti | |||
| if err := os.MkdirAll(tmpKanikoDir, 0o755); err != nil { | |||
| return nil, fmt.Errorf("failed to create kaniko dir: %w", err) | |||
| } | |||
| // Use the temporary directory as our 'magic dir'. | |||
| opts.MagicDirBase = tmpKanikoDir | |||
There was a problem hiding this comment.
(envbuilder nit: "base" makes me think of the directory that should contain the magicdir, i.e. [base]/.envbuilder).
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.
Relates to #43
Depends on coder/envbuilder#337 and coder/envbuilder#336