Merge pull request #2369 from mikebonnet/rag-deps-2026-01

Update all dependencies in the -rag images to their latest versions

container-images/common/Containerfile.rag

@@ -11,14 +11,12 @@ ENV VIRTUAL_ENV="/opt/venv" \
     HF_HOME=/var/cache/huggingface \
     FASTEMBED_CACHE_PATH=/var/cache/fastembed
 
-COPY container-images/scripts/build_rag.sh \
-     container-images/scripts/doc2rag \
+COPY container-images/scripts/doc2rag \
      container-images/scripts/rag_framework \
      /usr/bin/
 # Keep the tag below in sync with the tag used for ggml in requirements-rag.in
-ADD --chmod=755 https://github.com/ggml-org/llama.cpp/raw/refs/tags/b6900/convert_hf_to_gguf.py \
+ADD --chmod=755 https://github.com/ggml-org/llama.cpp/raw/refs/tags/b7872/convert_hf_to_gguf.py \
     /usr/bin/
-COPY container-images/common/requirements-rag-$TORCH_BACKEND* \
-     /var/tmp/
 
-RUN build_rag.sh $TORCH_BACKEND
+RUN --mount=type=bind,target=/src\
+    /src/container-images/scripts/build_rag.sh $TORCH_BACKEND

container-images/common/requirements-rag.in

@@ -1,6 +1,6 @@
 # requirements for convert_hf_to_gguf.py
 # Keep the tag below in sync with the tag used for convert_hf_to_gguf.py in Containerfile.rag
-git+https://github.com/ggml-org/llama.cpp@b6900#subdirectory=gguf-py
+git+https://github.com/ggml-org/llama.cpp@b7872#subdirectory=gguf-py
 mistral-common
 numpy
 protobuf

container-images/scripts/build_rag.sh

@@ -31,10 +31,12 @@ install_pkgs() {
 }
 
 install_requirements() {
-    if [ -f "/var/tmp/requirements-rag-$backend-$(uname -m).txt" ]; then
-        uv pip install -r "/var/tmp/requirements-rag-$backend-$(uname -m).txt"
+    local script_dir
+    script_dir="$(dirname "$0")"
+    if [ -f "$script_dir/../common/requirements-rag-$backend-$(uname -m).txt" ]; then
+        uv pip install -r "$script_dir/../common/requirements-rag-$backend-$(uname -m).txt"
     else
-        uv pip install -r "/var/tmp/requirements-rag-$backend.txt"
+        uv pip install -r "$script_dir/../common/requirements-rag-$backend.txt"
     fi
 }