build: lookup the right git binary on WSL #1477
Merged
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
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
tonistiigi
reviewed
Dec 15, 2022
tonistiigi
reviewed
Dec 15, 2022
build/git.go
Outdated
| @@ -50,30 +51,45 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st | |||
|
|
|||
| gitc, err := gitutil.New(gitutil.WithContext(ctx), gitutil.WithWorkingDir(wd)) | |||
| if err != nil { | |||
| logrus.Warnf("Failed to initialize git: %v", err) | |||
| if st, err := os.Stat(path.Join(wd, ".git")); err == nil && st.IsDir() { | |||
| return nil, errors.New("git not found in PATH, but .git directory exists") | |||
There was a problem hiding this comment.
Still a warning, not a failing error.
WARN: No git was found in the system. Current commit information was not captured by the build.
There was a problem hiding this comment.
I didn't notice that warning is on caller side. But update the message.
tonistiigi
reviewed
Dec 15, 2022
build/git.go
Outdated
| return | ||
| } | ||
|
|
||
| if !gitc.IsInsideWorkTree() { | ||
| logrus.Warnf("Unable to determine git information") | ||
| return | ||
| return nil, errors.New("not inside a git repository") |
There was a problem hiding this comment.
Not an error. If no git repo then just continue.
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
tonistiigi
approved these changes
Dec 16, 2022
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This was referenced Dec 15, 2023
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.
closes #1470
Windows drives in WSL version 2 uses the 9P protocol which the WSL instance connects to. When running git operations on a 9p fs using git from
/usr/bin/git, it can be quite slow:But using
git.exeis quite fast:This change will detect if git operations occur on WSL and on a 9p fs and in this case lookup for
git.exe, otherwise fallback togit.Signed-off-by: CrazyMax crazy-max@users.noreply.github.com