Tweak fast build cache and file exposure #2188
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
Contributor
nevillelyh
commented
Mar 7, 2025
- Clean up build cache
- Only overwrite env.txt if different
- Bind mount . => /src during monobase.user build
* Replace broken global .cog_cache with id=monobase-cache * APT cache is not needed now that we build APT tarball with docker run * Rename tmpMount variable name
* So that Python wheel or zip files in requirements.txt are exposed to uv pip install
nevillelyh
commented
Mar 7, 2025
| @@ -227,12 +228,12 @@ func (g *FastGenerator) generateMonobase(lines []string, tmpDir string) ([]strin | |||
|
|
|||
| // The only input to monobase.build are these ENV vars | |||
| // Write them in tmp mount for layer caching | |||
| err := os.WriteFile(path.Join(tmpDir, "env.txt"), []byte(strings.Join(envs, "\n")), 0o644) | |||
| err := files.WriteIfDifferent(path.Join(tmpDir, "env.txt"), strings.Join(envs, "\n")) | |||
There was a problem hiding this comment.
Overwriting files with same content changes its timestamp and invalidates layer cache. So only write if content changed.
| @@ -16,10 +17,10 @@ import ( | |||
| ) | |||
|
|
|||
| const FUSE_RPC_WEIGHTS_PATH = "/srv/r8/fuse-rpc/weights/sha256" | |||
| const MONOBASE_CACHE_PATH = "/var/cache/monobase" | |||
| const APT_CACHE_MOUNT = "--mount=type=cache,target=/var/cache/apt,id=apt-cache,sharing=locked" | |||
There was a problem hiding this comment.
We're not caching /var/cache/apt for the APT tarball building stage. But those are usually small and rarely change. We can add cache later if it becomes problematic.
| @@ -288,10 +288,12 @@ func (g *FastGenerator) installPython(lines []string, tmpDir string) ([]string, | |||
| return nil, err | |||
| } | |||
| if requirementsFile != "" { | |||
| srcMount := "--mount=type=bind,ro,source=.,target=/src" | |||
There was a problem hiding this comment.
Python wheel/zip files in requirements.txt cannot be in .dockerignore or they'll not be exposed via this bind mount. OTOH they'll be baked into the /src layer unless we parse requirements, check existence and add them to --exclude in the COPY step, overkill for now assuming most private packages are small.
8W9aG
approved these changes
Mar 7, 2025
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.