From cb7dad96c19be1f9f29330dd7ff949a880030625 Mon Sep 17 00:00:00 2001
From: "Billy D." <billy.davies.10@icloud.com>
Date: Tue, 3 Feb 2026 21:07:00 -0500
Subject: [PATCH] fix: PATH variable expansion in ROCm worker Dockerfiles

Split ENV ROCM_HOME and ENV PATH into separate commands to fix variable
expansion issue. When ROCM_HOME and PATH were in the same ENV line,
${ROCM_HOME} expanded to empty string since it wasn't defined yet.

This was causing 'ray: command not found' in init containers.
---
 dockerfiles/Dockerfile.ray-worker-rdna2     | 12 ++++++------
 dockerfiles/Dockerfile.ray-worker-strixhalo | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dockerfiles/Dockerfile.ray-worker-rdna2 b/dockerfiles/Dockerfile.ray-worker-rdna2
index 601b4a7..49dad21 100644
--- a/dockerfiles/Dockerfile.ray-worker-rdna2
+++ b/dockerfiles/Dockerfile.ray-worker-rdna2
@@ -28,12 +28,12 @@ WORKDIR /app
 # Copy ROCm stack from vendor image (single COPY layer)
 COPY --from=rocm-source /opt/rocm /opt/rocm
 
-# ROCm environment variables
-ENV ROCM_HOME=/opt/rocm \
-    PATH="${ROCM_HOME}/bin:${ROCM_HOME}/llvm/bin:${PATH}" \
-    LD_LIBRARY_PATH="${ROCM_HOME}/lib:${ROCM_HOME}/lib64:${LD_LIBRARY_PATH}" \
-    HSA_PATH="${ROCM_HOME}/hsa" \
-    HIP_PATH="${ROCM_HOME}/hip" \
+# ROCm environment variables - split to ensure ROCM_HOME is set first
+ENV ROCM_HOME=/opt/rocm
+ENV PATH="/opt/rocm/bin:/opt/rocm/llvm/bin:/home/ray/anaconda3/bin:/home/ray/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
+    LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/lib64" \
+    HSA_PATH="/opt/rocm/hsa" \
+    HIP_PATH="/opt/rocm/hip" \
     # RDNA 2 specific settings
     HIP_VISIBLE_DEVICES=0 \
     HSA_ENABLE_SDMA=0 \
diff --git a/dockerfiles/Dockerfile.ray-worker-strixhalo b/dockerfiles/Dockerfile.ray-worker-strixhalo
index e4d729e..882b44c 100644
--- a/dockerfiles/Dockerfile.ray-worker-strixhalo
+++ b/dockerfiles/Dockerfile.ray-worker-strixhalo
@@ -29,12 +29,12 @@ WORKDIR /app
 # Copy ROCm stack from vendor image
 COPY --from=rocm-source /opt/rocm /opt/rocm
 
-# ROCm environment variables
-ENV ROCM_HOME=/opt/rocm \
-    PATH="${ROCM_HOME}/bin:${ROCM_HOME}/llvm/bin:${PATH}" \
-    LD_LIBRARY_PATH="${ROCM_HOME}/lib:${ROCM_HOME}/lib64:${LD_LIBRARY_PATH}" \
-    HSA_PATH="${ROCM_HOME}/hsa" \
-    HIP_PATH="${ROCM_HOME}/hip" \
+# ROCm environment variables - split to ensure ROCM_HOME is set first
+ENV ROCM_HOME=/opt/rocm
+ENV PATH="/opt/rocm/bin:/opt/rocm/llvm/bin:/home/ray/anaconda3/bin:/home/ray/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
+    LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/lib64" \
+    HSA_PATH="/opt/rocm/hsa" \
+    HIP_PATH="/opt/rocm/hip" \
     # Strix Halo (gfx1151) specific settings
     HIP_VISIBLE_DEVICES=0 \
     HSA_ENABLE_SDMA=0 \