Repository navigation
Conversation
Signed-off-by: hiroto.toyoda <hiroto.toyoda@dena.com>
This branch has not been deployed
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
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.
What this PR does
Makes
docker compose watchignore changes under the project's.gitdirectory, as it was meant to. Before this change, git operations inside the watched path were synced into containers, and with arebuildaction a single edit triggered rebuilds that never stopped.Related issue
Fixes #14362
Changes made
pkg/compose/watch.go: the hardcoded.gitignore rule ingetWatchRulesnow uses the**/.gitpattern instead of.git/. Patterns are joined to the/base path, so.git/only matched/.git, while watch events carry full paths such as/home/me/project/.git/index. The rebuild loop came from buildx updating.giton every build while it reads the git state for provenance, so each build looked like a new change.pkg/compose/watch_test.go: a table test checking that the watch rule ignores.git, its content, and a nested.git(vendor/lib/.git/HEAD), but notmain.go,.gitignoreor.github/. The.gitcases fail without the fix..gitdirectories.Testing done
make testmake e2e-composeormake e2e-compose-standalonemake lintmake fmtAI tool used (if applicable)
AI Tool:
Additional context
#14217 also changes the ignore rules in
pkg/compose/watch.go(it excludes the Dockerfile and compose files) but does not touch.git. Whichever lands second may need a small rebase.(not mandatory) A picture of a cute animal, if possible in relation to what you did