Do not make hidden directory inside builder shim - #71
Merged
Conversation
jglogan
approved these changes
Mar 13, 2026
jglogan
approved these changes
Mar 14, 2026
JaewonHur
added a commit
that referenced
this pull request
Apr 18, 2026
This PR resolves the issue when using docker specific ignore file with read-only build context (apple/container#1343). Once the `dockerignore` argument is provided in `PerformBuild` gRPC, it performs following two operations. First, after unpacking transferred build context archive into `cache` directory, it creates a `DockerfileStaging` (i.e., `.com.apple.container`) directory there, and copies `Dockerfile` and `Dockerfile.dockerignore`. The path to `DockerfileStaging` is passed to the buildkit daemon so that it can correctly figure out which dockerignore file to read. Second, it handles data requests for `Dockerfile` and `Dockerfile.dockerignore` (i.e., `diffcopy.go:sender::sendFile`), so that the requests before the actual files are written can be correctly served---i.e., refer #71 for more context about this race issue.
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
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.
Previous docker ignore fix (#68) has race bug when syncing files to the buildkit daemon. Upon file request from buildkitd, the FSSync proxy in builder shim checks
_checksumvariable to check if build context is synced inside VM, and responds differently: i) if not, it forwards a request to the proxy outside to get the file, ii) if synced, it immediately provides the file.However, since #68 creates a hidden docker directory inside builder shim during sync, if the request for Dockerfile is received before the sync, it just forwards the request outside, which doesn't know that hidden directory.
This PR assumes the directory is created outside, so that such request can be handled.