From d6e76f8e2f383f245efe18d730d0dedaff9d7e89 Mon Sep 17 00:00:00 2001
From: Drew Botwinick <drew.botwinick@scitrera.com>
Date: Sat, 21 Mar 2026 16:10:04 -0500
Subject: [PATCH 1/2] add build metadata generation and include in Dockerfiles

---
 .gitignore        |  3 ++-
 Dockerfile        |  3 +++
 Dockerfile.mxfp4  |  3 +++
 build-and-copy.sh | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2eea525..6a0a8ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.env
\ No newline at end of file
+.env
+build-metadata.yaml
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index cce0e4a..b7a06cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -275,6 +275,9 @@ ENV PATH=$VLLM_BASE_DIR:$PATH
 RUN --mount=type=cache,id=uv-cache,target=/root/.cache/uv \
     uv pip install ray[default] fastsafetensors nvidia-nvshmem-cu13
 
+# Build metadata (generated by build-and-copy.sh)
+COPY build-metadata.yaml /workspace/build-metadata.yaml
+
 # Cleanup
 
 # Keeping it here for reference - this won't work as is without squashing layers
diff --git a/Dockerfile.mxfp4 b/Dockerfile.mxfp4
index 4b4a895..bedcf4a 100644
--- a/Dockerfile.mxfp4
+++ b/Dockerfile.mxfp4
@@ -274,6 +274,9 @@ ENV PATH=$VLLM_BASE_DIR:$PATH
 RUN --mount=type=cache,id=uv-cache,target=/root/.cache/uv \
     uv pip install ray[default] fastsafetensors nvidia-nvshmem-cu13
 
+# Build metadata (generated by build-and-copy.sh)
+COPY build-metadata.yaml /workspace/build-metadata.yaml
+
 # If not compiling Triton
 # remove triton-kernels as they are not compatible with this vLLM version yet
 RUN uv pip uninstall triton-kernels
diff --git a/build-and-copy.sh b/build-and-copy.sh
index a954fc5..a1dae52 100755
--- a/build-and-copy.sh
+++ b/build-and-copy.sh
@@ -33,10 +33,42 @@ cleanup() {
         echo "Cleaning up temporary image $TMP_IMAGE"
         rm -f "$TMP_IMAGE"
     fi
+    rm -f ./build-metadata.yaml
 }
 
 trap cleanup EXIT
 
+generate_build_metadata() {
+    local dockerfile="$1"
+    local vllm_version="$2"
+    local vllm_commit="$3"
+    local flashinfer_commit="$4"
+    local vllm_ref="$5"
+    local pre_transformers="$6"
+    local exp_mxfp4="$7"
+    local vllm_prs="$8"
+
+    local base_image
+    base_image=$(grep -m1 '^FROM .* AS runner' "$dockerfile" | awk '{print $2}')
+
+    cat > ./build-metadata.yaml <<EOF
+build_date: $(date -u +"%Y-%m-%dT%H:%M:%SZ")
+build_script_commit: $(git rev-parse HEAD 2>/dev/null || echo "unknown")
+vllm_version: ${vllm_version:-unknown}
+vllm_commit: ${vllm_commit:-unknown}
+flashinfer_commit: ${flashinfer_commit:-unknown}
+gpu_arch: ${GPU_ARCH_LIST}
+base_image: ${base_image:-unknown}
+build_args:
+  vllm_ref: ${vllm_ref}
+  pre_transformers: ${pre_transformers}
+  exp_mxfp4: ${exp_mxfp4}
+  vllm_prs: "${vllm_prs}"
+  build_jobs: ${BUILD_JOBS}
+EOF
+    echo "Generated build-metadata.yaml"
+}
+
 add_copy_hosts() {
     local token part
     for token in "$@"; do
@@ -365,6 +397,13 @@ RUNNER_BUILD_TIME=0
 if [ "$NO_BUILD" = false ]; then
     if [ "$EXP_MXFP4" = true ]; then
         echo "Building with experimental MXFP4 support..."
+
+        # Generate build metadata YAML for mxfp4 build
+        MXFP4_VLLM_SHA=$(grep -m1 '^ARG VLLM_SHA=' Dockerfile.mxfp4 | cut -d= -f2)
+        MXFP4_FLASHINFER_SHA=$(grep -m1 '^ARG FLASHINFER_SHA=' Dockerfile.mxfp4 | cut -d= -f2)
+        generate_build_metadata Dockerfile.mxfp4 "unknown" "$MXFP4_VLLM_SHA" "$MXFP4_FLASHINFER_SHA" \
+            "mxfp4-pinned" "false" "true" ""
+
         CMD=("docker" "build" "-t" "$IMAGE_TAG" "${COMMON_BUILD_FLAGS[@]}" "-f" "Dockerfile.mxfp4" ".")
         echo "Building image with command: ${CMD[*]}"
         BUILD_START=$(date +%s)
@@ -496,6 +535,15 @@ if [ "$NO_BUILD" = false ]; then
             exit 1
         fi
 
+        # Generate build metadata YAML
+        VLLM_VERSION=$(ls ./wheels/vllm-*.whl 2>/dev/null | head -1 | sed 's|.*/vllm-||;s|-.*||')
+        VLLM_COMMIT=""
+        [ -f "./wheels/.vllm-commit" ] && VLLM_COMMIT=$(cat ./wheels/.vllm-commit)
+        FLASHINFER_COMMIT=""
+        [ -f "./wheels/.flashinfer-commit" ] && FLASHINFER_COMMIT=$(cat ./wheels/.flashinfer-commit)
+        generate_build_metadata Dockerfile "$VLLM_VERSION" "$VLLM_COMMIT" "$FLASHINFER_COMMIT" \
+            "$VLLM_REF" "$PRE_TRANSFORMERS" "false" "$VLLM_PRS"
+
         RUNNER_CMD=("docker" "build"
             "-t" "$IMAGE_TAG"
             "${COMMON_BUILD_FLAGS[@]}")

From 7fa69187dfd17f5f446ab2564bbbf4a7716f7678 Mon Sep 17 00:00:00 2001
From: Eugene Rakhmatulin <eugr@eugr.com>
Date: Tue, 24 Mar 2026 22:18:07 -0700
Subject: [PATCH 2/2] metadata changes

---
 build-and-copy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-and-copy.sh b/build-and-copy.sh
index a1dae52..d019ea0 100755
--- a/build-and-copy.sh
+++ b/build-and-copy.sh
@@ -61,7 +61,7 @@ gpu_arch: ${GPU_ARCH_LIST}
 base_image: ${base_image:-unknown}
 build_args:
   vllm_ref: ${vllm_ref}
-  pre_transformers: ${pre_transformers}
+  transformers_5: ${pre_transformers}
   exp_mxfp4: ${exp_mxfp4}
   vllm_prs: "${vllm_prs}"
   build_jobs: ${BUILD_JOBS}