fix(docker): Correct cargo dependency caching in build stages #9410
+56
−35
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
Previously, the Dockerfile used cache mounts targeting specific subdirectories (`/usr/local/cargo/registry/` and `/usr/local/cargo/git/db`) which did not align with the `CARGO_HOME` environment variable (`/home/zebra/.cargo`).
This prevented Cargo from utilizing the cache for downloaded dependencies and the registry index, causing them to be re-downloaded on subsequent builds.
This change replaces the specific subdirectory mounts with a single cache mount targeting the `${CARGO_HOME}` directory directly in both the `tests` and `release` stages. This ensures that BuildKit's cache is correctly utilized by Cargo, significantly speeding up rebuilds by avoiding unnecessary downloads.
This also adds a `--link` parameter to the `COPY` commands, to isolate this layers and avoid invalidating following COPY commands
gustavovalverde
added
A-devops
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🔴 ⛓️ Depends-On RequirementsThis rule is failing.Requirement based on the presence of
|
|
I found this issue while testing
We might need to do further improvements to actually accomplish what we'd like here. |
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.
Motivation
Caching was not being used correctly in our Dockerfile
Depends-On: #9344
Solution
Previously, the Dockerfile used cache mounts targeting specific subdirectories (
/usr/local/cargo/registry/and/usr/local/cargo/git/db) which did not align with theCARGO_HOMEenvironment variable (/home/zebra/.cargo). This prevented Cargo from utilizing the cache for downloaded dependencies and the registry index, causing them to be re-downloaded on subsequent builds.This change replaces the specific subdirectory mounts with a single cache mount targeting the
${CARGO_HOME}directory directly in both thetestsandreleasestages. This ensures that BuildKit's cache is correctly utilized by Cargo, significantly speeding up rebuilds by avoiding unnecessary downloads.Tests
This should be faster than our actual rebuilds, and also than #9328
Specifications & References
PR Checklist
C-exclude-from-changeloglabel.