diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2022-10-14 14:11:27 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2022-10-14 14:11:27 -0400 |
| commit | bc2bd92b930288f3c4bb08a72d8dba24d7416ffd (patch) | |
| tree | fffa5bb099b5aa81e27a9b663a22bd57cc3300fe /docker | |
| parent | Accept threaded receipts for events related to the root event. (#14174) (diff) | |
| parent | 1.69.0rc4 (diff) | |
| download | synapse-bc2bd92b930288f3c4bb08a72d8dba24d7416ffd.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.69' into develop
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 48fe95d9fd..f13d45bcd9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -108,6 +108,12 @@ RUN mkdir /rust /cargo RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable --profile minimal + +# arm64 builds consume a lot of memory if `CARGO_NET_GIT_FETCH_WITH_CLI` is not +# set to true, so we expose it as a build-arg. +ARG CARGO_NET_GIT_FETCH_WITH_CLI=false +ENV CARGO_NET_GIT_FETCH_WITH_CLI=$CARGO_NET_GIT_FETCH_WITH_CLI + # To speed up rebuilds, install all of the dependencies before we copy over # the whole synapse project, so that this layer in the Docker cache can be # used while you develop on the source @@ -121,7 +127,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 |