diff options
| author | Erik Johnston <erik@matrix.org> | 2022-10-11 11:53:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 10:53:34 +0000 |
| commit | d94bcbced3840bb60a299136dfeb8ef380968b5a (patch) | |
| tree | c6cb112d487ea333c8afffbd513ffee534910e52 | |
| parent | Unpin build-system requirements, but impose an upper-bound (#14085) (diff) | |
| download | synapse-d94bcbced3840bb60a299136dfeb8ef380968b5a.tar.xz | |
Fix pinning Rust deps in docker images (#14129)
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | changelog.d/14129.bugfix | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.dockerignore b/.dockerignore index 1c6905b1bb..0b51345cbd 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/changelog.d/14129.bugfix b/changelog.d/14129.bugfix new file mode 100644 index 0000000000..2c016c0c4a --- /dev/null +++ b/changelog.d/14129.bugfix @@ -0,0 +1 @@ +Fix an issue with Docker images causing the Rust dependencies to not be pinned correctly. diff --git a/docker/Dockerfile b/docker/Dockerfile index b20951d4cf..8be49681b4 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 |