From 3068fa89e878c702bd45e5b5173c4e7b7d716ffd Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Tue, 4 Nov 2025 13:53:04 -0500
Subject: [PATCH] Docker builds target rust toolchain with bundled musl v1.2.5
 (#16584)

## Summary

Addresses https://github.com/astral-sh/uv/issues/8450 for docker builds

## Test Plan

* Ubuntu Tests [CI
Run](https://github.com/samypr100/uv/actions/runs/19054484993/job/54421786118)
with `nightly-2025-11-02` set in root `rust-toolchain.toml`
* Manually test functionality using locally built binaries from
cargo-zigbuild
---
 Dockerfile          | 9 ++++++++-
 rust-toolchain.toml | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 856fe0f92..51ab2f2ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,15 @@ RUN case "$TARGETPLATFORM" in \
   *) exit 1 ;; \
   esac
 
+# Temporarily using nightly-2025-11-02 for bundled musl v1.2.5
+# Ref: https://github.com/rust-lang/rust/pull/142682
+# TODO(samypr100): Remove when toolchain updates to 1.93
+COPY <<EOF rust-toolchain.toml
+[toolchain]
+channel = "nightly-2025-11-02"
+EOF
 # Update rustup whenever we bump the rust version
-COPY rust-toolchain.toml rust-toolchain.toml
+# COPY rust-toolchain.toml rust-toolchain.toml
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --target $(cat rust_target.txt) --profile minimal --default-toolchain none
 ENV PATH="$HOME/.cargo/bin:$PATH"
 # Install the toolchain then the musl target
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 1a35d6643..c9ecb4e09 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,3 @@
+# TODO(samypr100): When updating to 1.93, adjust Dockerfile to remove nightly-2025-11-02
 [toolchain]
 channel = "1.91"