Browse Source

Fix pinning Rust deps in docker images (#14129)

tags/v1.69.0rc3
Erik Johnston 1 year ago
committed by GitHub
parent
commit
d94bcbced3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
  1. +1
    -0
      .dockerignore
  2. +1
    -0
      changelog.d/14129.bugfix
  3. +1
    -1
      docker/Dockerfile

+ 1
- 0
.dockerignore View File

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

rust/target


+ 1
- 0
changelog.d/14129.bugfix View File

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

+ 1
- 1
docker/Dockerfile View File

@@ -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


Loading…
Cancel
Save