OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix pinning Rust deps in docker images (#14129)

pull/14135/head
Erik Johnston 2022-10-11 11:53:34 +01:00 committed by GitHub
parent f1673866ed
commit d94bcbced3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -9,6 +9,7 @@
!pyproject.toml !pyproject.toml
!poetry.lock !poetry.lock
!Cargo.lock !Cargo.lock
!Cargo.toml
!build_rust.py !build_rust.py
rust/target rust/target

1
changelog.d/14129.bugfix Normal file
View File

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

2
docker/Dockerfile
View File

@ -121,7 +121,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
COPY synapse /synapse/synapse/ COPY synapse /synapse/synapse/
COPY rust /synapse/rust/ COPY rust /synapse/rust/
# ... and what we need to `pip install`. # ... 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. # Repeat of earlier build argument declaration, as this is a new build stage.
ARG TEST_ONLY_IGNORE_POETRY_LOCKFILE ARG TEST_ONLY_IGNORE_POETRY_LOCKFILE