Skip to content

Commit d94bcbc

Browse files
authoredOct 11, 2022
Fix pinning Rust deps in docker images (#14129)
1 parent f167386 commit d94bcbc

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed
 

‎.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
!pyproject.toml
1010
!poetry.lock
1111
!Cargo.lock
12+
!Cargo.toml
1213
!build_rust.py
1314

1415
rust/target

‎changelog.d/14129.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix an issue with Docker images causing the Rust dependencies to not be pinned correctly.

‎docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
121121
COPY synapse /synapse/synapse/
122122
COPY rust /synapse/rust/
123123
# ... and what we need to `pip install`.
124-
COPY pyproject.toml README.rst build_rust.py /synapse/
124+
COPY pyproject.toml README.rst build_rust.py Cargo.toml Cargo.lock /synapse/
125125

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

0 commit comments

Comments
 (0)
Please sign in to comment.