From c924815c76d2be9631042040df7f022b15f57ccf Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 11 Oct 2022 09:08:25 +0100 Subject: [PATCH 1/3] Fix pinning Rust deps in docker images --- .dockerignore | 1 + docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 1c6905b1bbb3..0b51345cbdb0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -9,6 +9,7 @@ !pyproject.toml !poetry.lock !Cargo.lock +!Cargo.toml !build_rust.py rust/target diff --git a/docker/Dockerfile b/docker/Dockerfile index b20951d4cf62..8be49681b414 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 From bb34d2271b439e7fa2c5dca026999e027c2d95ca Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 11 Oct 2022 09:16:52 +0100 Subject: [PATCH 2/3] Newsfile --- changelog.d/14129.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/14129.bugfix diff --git a/changelog.d/14129.bugfix b/changelog.d/14129.bugfix new file mode 100644 index 000000000000..c392d07d22b2 --- /dev/null +++ b/changelog.d/14129.bugfix @@ -0,0 +1 @@ +Fix pinning Rust dependencies in docker images. From 95b4ba84fc98d12b913b631a756d0082720e85bb Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 11 Oct 2022 11:20:18 +0100 Subject: [PATCH 3/3] Update changelog.d/14129.bugfix Co-authored-by: Brendan Abolivier --- changelog.d/14129.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/14129.bugfix b/changelog.d/14129.bugfix index c392d07d22b2..2c016c0c4a7a 100644 --- a/changelog.d/14129.bugfix +++ b/changelog.d/14129.bugfix @@ -1 +1 @@ -Fix pinning Rust dependencies in docker images. +Fix an issue with Docker images causing the Rust dependencies to not be pinned correctly.