Skip to content

Commit 2c64e63

Browse files
authored
add rust toolchain to build and dev containers (pypi#17452)
a release of orjson caused `make deps` to start [failing unexpectedly](https://github.com/pypi/warehouse/actions/runs/12845424159/job/35819512078?pr=17451) with: ``` + pip-compile --upgrade -o /tmp/tmp.VM3uXJx64Y/main.txt requirements/main.in error: subprocess-exited-with-error × Preparing metadata (pyproject.toml) did not run successfully. │ exit code: 1 ╰─> [6 lines of output] Checking for Rust toolchain.... Cargo, the Rust package manager, is not installed or is not on PATH. This package requires Rust and Cargo to compile extensions. Install it through the system's package manager or via https://rustup.rs/ [end of output] note: This error originates from a subprocess, and is likely not a problem with pip. ``` This adds the rust toolchain to our build intermediate container, and development container so that builds and dependency resolution can utilize it.
1 parent efb8990 commit 2c64e63

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
137137
set -x \
138138
&& apt-get update \
139139
&& apt-get install --no-install-recommends -y \
140-
build-essential libffi-dev libxml2-dev libxslt-dev libpq-dev libcurl4-openssl-dev libssl-dev \
140+
build-essential libffi-dev libxml2-dev libxslt-dev libpq-dev libcurl4-openssl-dev libssl-dev rust-all \
141141
$(if [ "$DEVEL" = "yes" ]; then echo 'libjpeg-dev'; fi)
142142

143143
# We create an /opt directory with a virtual environment in it to store our
@@ -223,7 +223,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
223223
&& apt-get update \
224224
&& apt-get install --no-install-recommends -y \
225225
libpq5 libxml2 libxslt1.1 libcurl4 \
226-
$(if [ "$DEVEL" = "yes" ]; then echo 'bash libjpeg62 postgresql-client build-essential libffi-dev libxml2-dev libxslt-dev libpq-dev libcurl4-openssl-dev libssl-dev vim oathtool'; fi) \
226+
$(if [ "$DEVEL" = "yes" ]; then echo 'bash libjpeg62 postgresql-client build-essential libffi-dev libxml2-dev libxslt-dev libpq-dev libcurl4-openssl-dev libssl-dev vim oathtool rust-all'; fi) \
227227
&& apt-get clean \
228228
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
229229

0 commit comments

Comments
 (0)