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

Fix pinning Rust deps in docker images #14129

Merged
erikjohnston merged 3 commits into from
Oct 11, 2022
Merged

Fix pinning Rust deps in docker images #14129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 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
95b4ba8
Update changelog.d/14129.bugfix
erikjohnston Oct 11, 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 .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
!pyproject.toml
!poetry.lock
!Cargo.lock
!Cargo.toml
!build_rust.py

rust/target
Expand Down
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 an issue with Docker images causing the Rust dependencies to not be pinned correctly.
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
COPY synapse /synapse/synapse/
COPY rust /synapse/rust/
# ... and what we need to `pip install`.
COPY pyproject.toml README.rst build_rust.py /synapse/
COPY pyproject.toml README.rst build_rust.py Cargo.toml Cargo.lock /synapse/

# Repeat of earlier build argument declaration, as this is a new build stage.
ARG TEST_ONLY_IGNORE_POETRY_LOCKFILE
Expand Down