tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Use minimal Rust installation in docker images and CI (#14141)

Browse source
This commit is contained in:
David Robertson 2022-10-12 10:47:02 +01:00 committed by GitHub
parent a86b2f6837
commit 3f057e4c54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/14141.docker Normal file
View file

@ -0,0 +1 @@
Use the `minimal` Rust profile when building Synapse.

1
changelog.d/14141.misc Normal file
View file

@ -0,0 +1 @@
Use the `minimal` Rust profile when building Synapse.

2
docker/Dockerfile
View file

@ -106,7 +106,7 @@ ENV CARGO_HOME=/cargo
ENV PATH=/cargo/bin:/rust/bin:$PATH ENV PATH=/cargo/bin:/rust/bin:$PATH
RUN mkdir /rust /cargo 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 # 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 # the whole synapse project, so that this layer in the Docker cache can be

2
docker/Dockerfile-dhvirtualenv
View file

@ -92,7 +92,7 @@ ENV CARGO_HOME=/cargo
ENV PATH=/cargo/bin:/rust/bin:$PATH ENV PATH=/cargo/bin:/rust/bin:$PATH
RUN mkdir /rust /cargo 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 / COPY --from=builder /dh-virtualenv_1.2.2-1_all.deb /

2
pyproject.toml
View file

@ -316,7 +316,7 @@ build-backend = "poetry.core.masonry.api"
skip = "cp36* *-musllinux_i686" skip = "cp36* *-musllinux_i686"
# We need a rust compiler # 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" } environment= { PATH = "$PATH:$HOME/.cargo/bin" }
# For some reason if we don't manually clean the build directory we # For some reason if we don't manually clean the build directory we