Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Cache Rust build cache when building docker images #14130

Merged
merged 5 commits into from
Oct 17, 2022
Merged

Cache Rust build cache when building docker images #14130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c924815
Fix pinning Rust deps in docker images
erikjohnston Oct 11, 2022
bb34d22
Newsfile
erikjohnston Oct 11, 2022
84df0dc
Cache Rust build cache when building docker images
erikjohnston Oct 11, 2022
a55670f
Newsfile
erikjohnston Oct 11, 2022
bb01fb5
Merge branch 'develop' into erikj/cache_docker_rust
erikjohnston Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/14129.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix pinning Rust dependencies in docker images.
1 change: 1 addition & 0 deletions changelog.d/14130.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cache Rust build cache when building docker images.
4 changes: 3 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ ARG TEST_ONLY_IGNORE_POETRY_LOCKFILE
# Install the synapse package itself.
# If we have populated requirements.txt, we don't install any dependencies
# as we should already have those from the previous `pip install` step.
RUN if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \
RUN --mount=type=cache,target=/synapse/target,sharing=locked \
--mount=type=cache,target=${CARGO_HOME}/registry,sharing=locked \
Comment on lines +138 to +139
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need sharing=locked on the other caching that we do?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed in #synapse-dev,

I think the answer is probably? Otherwise concurrent runs will write over each others caches
though in practice I don't think you'd really build many docker images in parallel

-- @erikjohnston

Comment on lines +138 to +139
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RUN --mount=type=cache,target=/synapse/target,sharing=locked \
--mount=type=cache,target=${CARGO_HOME}/registry,sharing=locked \
//
// We also cache the Rust build in `/synapse/target` and Rust dependencies in `${CARGO_HOME}/registry` to speed-up rebuilds
RUN --mount=type=cache,target=/synapse/target,sharing=locked \
--mount=type=cache,target=${CARGO_HOME}/registry,sharing=locked \

if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \
pip install --prefix="/install" --no-deps --no-warn-script-location /synapse[all]; \
else \
pip install --prefix="/install" --no-warn-script-location /synapse[all]; \
Expand Down