Browse Source

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

tags/v1.70.0rc1
David Robertson 1 year ago
committed by GitHub
parent
commit
3f057e4c54
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 3 deletions
  1. +1
    -0
      changelog.d/14141.docker
  2. +1
    -0
      changelog.d/14141.misc
  3. +1
    -1
      docker/Dockerfile
  4. +1
    -1
      docker/Dockerfile-dhvirtualenv
  5. +1
    -1
      pyproject.toml

+ 1
- 0
changelog.d/14141.docker View File

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

+ 1
- 0
changelog.d/14141.misc View File

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

+ 1
- 1
docker/Dockerfile View File

@@ -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


+ 1
- 1
docker/Dockerfile-dhvirtualenv View File

@@ -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 /


+ 1
- 1
pyproject.toml View File

@@ -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


Loading…
Cancel
Save