Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit bae17b9

Browse files
David Robertsonclokep
authored andcommitted
Use minimal Rust installation in docker images and CI (#14141)
1 parent b41bc2d commit bae17b9

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

changelog.d/14141.docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use the `minimal` Rust profile when building Synapse.

changelog.d/14141.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use the `minimal` Rust profile when building Synapse.

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ ENV CARGO_HOME=/cargo
106106
ENV PATH=/cargo/bin:/rust/bin:$PATH
107107
RUN mkdir /rust /cargo
108108

109-
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable
109+
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable --profile minimal
110110

111111
# To speed up rebuilds, install all of the dependencies before we copy over
112112
# the whole synapse project, so that this layer in the Docker cache can be

docker/Dockerfile-dhvirtualenv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ENV CARGO_HOME=/cargo
9292
ENV PATH=/cargo/bin:/rust/bin:$PATH
9393
RUN mkdir /rust /cargo
9494

95-
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable
95+
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable --profile minimal
9696

9797

9898
COPY --from=builder /dh-virtualenv_1.2.2-1_all.deb /

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ build-backend = "poetry.core.masonry.api"
316316
skip = "cp36* *-musllinux_i686"
317317

318318
# We need a rust compiler
319-
before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y"
319+
before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y --profile minimal"
320320
environment= { PATH = "$PATH:$HOME/.cargo/bin" }
321321

322322
# For some reason if we don't manually clean the build directory we

0 commit comments

Comments
 (0)