From 71c82bd33cc6577c560bcf2da17f7b02b16187d1 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Tue, 11 Oct 2022 17:09:07 +0100
Subject: [PATCH 1/2] Use minimal Rust installation in docker images and CI

Closes #14139
---
 docker/Dockerfile              | 2 +-
 docker/Dockerfile-dhvirtualenv | 2 +-
 pyproject.toml                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b20951d4cf62..48fe95d9fd5c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -106,7 +106,7 @@ ENV CARGO_HOME=/cargo
 ENV PATH=/cargo/bin:/rust/bin:$PATH
 RUN mkdir /rust /cargo
 
-RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable
+RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable --profile minimal
 
 # 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
diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv
index ca3a259081c3..73165f6f85ed 100644
--- a/docker/Dockerfile-dhvirtualenv
+++ b/docker/Dockerfile-dhvirtualenv
@@ -92,7 +92,7 @@ ENV CARGO_HOME=/cargo
 ENV PATH=/cargo/bin:/rust/bin:$PATH
 RUN mkdir /rust /cargo
 
-RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable
+RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable --profile minimal
 
 
 COPY --from=builder /dh-virtualenv_1.2.2-1_all.deb /
diff --git a/pyproject.toml b/pyproject.toml
index 5e36baf40dc6..3dc4b66ca9b8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -316,7 +316,7 @@ build-backend = "poetry.core.masonry.api"
 skip = "cp36* *-musllinux_i686"
 
 # We need a rust compiler
-before-all =  "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y"
+before-all =  "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y --profile minimal"
 environment= { PATH = "$PATH:$HOME/.cargo/bin" }
 
 # For some reason if we don't manually clean the build directory we

From 2c4ab7622bf615dc10884afc51269aa466ed7e77 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Tue, 11 Oct 2022 17:14:18 +0100
Subject: [PATCH 2/2] Changelog

---
 changelog.d/14141.docker | 1 +
 changelog.d/14141.misc   | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/14141.docker
 create mode 100644 changelog.d/14141.misc

diff --git a/changelog.d/14141.docker b/changelog.d/14141.docker
new file mode 100644
index 000000000000..561806cdaebb
--- /dev/null
+++ b/changelog.d/14141.docker
@@ -0,0 +1 @@
+Use the `minimal` Rust profile when building Synapse.
diff --git a/changelog.d/14141.misc b/changelog.d/14141.misc
new file mode 100644
index 000000000000..561806cdaebb
--- /dev/null
+++ b/changelog.d/14141.misc
@@ -0,0 +1 @@
+Use the `minimal` Rust profile when building Synapse.