From 906d5654ae9721e8de8442d534270da942c8d57f Mon Sep 17 00:00:00 2001 From: Alvaro Bartolome <36760800+alvarobartt@users.noreply.github.com> Date: Mon, 13 Jan 2025 11:18:36 +0100 Subject: [PATCH 1/3] Pin `cargo-chef` installation to 0.1.62 Matching the version installed in the `Dockerfile` from the base image at `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` --- Dockerfile-cuda | 4 +++- Dockerfile-cuda-all | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile-cuda b/Dockerfile-cuda index 1e39fb1e..35328e87 100644 --- a/Dockerfile-cuda +++ b/Dockerfile-cuda @@ -3,6 +3,8 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder ENV SCCACHE=0.5.4 ENV RUSTC_WRAPPER=/usr/local/bin/sccache ENV PATH="/root/.cargo/bin:${PATH}" +# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` +ENV CARGO_CHEF=0.1.62 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ curl \ @@ -15,7 +17,7 @@ RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v$SCCACHE/sc chmod +x /usr/local/bin/sccache RUN curl https://sh.rustup.rs -sSf | bash -s -- -y -RUN cargo install cargo-chef --locked +RUN cargo install cargo-chef --version $CARGO_CHEF --locked FROM base-builder AS planner diff --git a/Dockerfile-cuda-all b/Dockerfile-cuda-all index 851a3c97..3492cdc2 100644 --- a/Dockerfile-cuda-all +++ b/Dockerfile-cuda-all @@ -3,6 +3,8 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder ENV SCCACHE=0.5.4 ENV RUSTC_WRAPPER=/usr/local/bin/sccache ENV PATH="/root/.cargo/bin:${PATH}" +# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` +ENV CARGO_CHEF=0.1.62 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ curl \ @@ -15,7 +17,7 @@ RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v$SCCACHE/sc chmod +x /usr/local/bin/sccache RUN curl https://sh.rustup.rs -sSf | bash -s -- -y -RUN cargo install cargo-chef --locked +RUN cargo install cargo-chef --version $CARGO_CHEF --locked FROM base-builder AS planner From e75aedad21ff027f601c6e18ec2d0c095fd3ecfa Mon Sep 17 00:00:00 2001 From: Alvaro Bartolome <36760800+alvarobartt@users.noreply.github.com> Date: Mon, 13 Jan 2025 16:52:26 +0100 Subject: [PATCH 2/3] Fix `pre-commit` hooks --- Dockerfile-cuda | 2 +- Dockerfile-cuda-all | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-cuda b/Dockerfile-cuda index 35328e87..be6df7d6 100644 --- a/Dockerfile-cuda +++ b/Dockerfile-cuda @@ -3,7 +3,7 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder ENV SCCACHE=0.5.4 ENV RUSTC_WRAPPER=/usr/local/bin/sccache ENV PATH="/root/.cargo/bin:${PATH}" -# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` +# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` ENV CARGO_CHEF=0.1.62 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/Dockerfile-cuda-all b/Dockerfile-cuda-all index 3492cdc2..b14ff7e8 100644 --- a/Dockerfile-cuda-all +++ b/Dockerfile-cuda-all @@ -3,7 +3,7 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder ENV SCCACHE=0.5.4 ENV RUSTC_WRAPPER=/usr/local/bin/sccache ENV PATH="/root/.cargo/bin:${PATH}" -# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` +# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` ENV CARGO_CHEF=0.1.62 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ From 63e9d9f2746459501b7dbfb953325e0d4ab4ddfb Mon Sep 17 00:00:00 2001 From: Alvaro Bartolome <36760800+alvarobartt@users.noreply.github.com> Date: Wed, 26 Feb 2025 11:20:52 +0100 Subject: [PATCH 3/3] Update `CARGO_CHEF` as of the recent `cargo-chef` image bump --- Dockerfile-cuda | 4 ++-- Dockerfile-cuda-all | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-cuda b/Dockerfile-cuda index a1f687b5..3ffc13ee 100644 --- a/Dockerfile-cuda +++ b/Dockerfile-cuda @@ -3,8 +3,8 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder ENV SCCACHE=0.5.4 ENV RUSTC_WRAPPER=/usr/local/bin/sccache ENV PATH="/root/.cargo/bin:${PATH}" -# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` -ENV CARGO_CHEF=0.1.62 +# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.85-bookworm` +ENV CARGO_CHEF=0.1.71 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ curl \ diff --git a/Dockerfile-cuda-all b/Dockerfile-cuda-all index e1d7f99a..76ad31ff 100644 --- a/Dockerfile-cuda-all +++ b/Dockerfile-cuda-all @@ -3,8 +3,8 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder ENV SCCACHE=0.5.4 ENV RUSTC_WRAPPER=/usr/local/bin/sccache ENV PATH="/root/.cargo/bin:${PATH}" -# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.75-bookworm` -ENV CARGO_CHEF=0.1.62 +# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.85-bookworm` +ENV CARGO_CHEF=0.1.71 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ curl \