chore: sync downstream changes to midstream main

Signed-off-by: Nathan Weinberg <nweinber@redhat.com>

Author: nathan-weinberg

redhat-distribution/Containerfile

@@ -45,4 +45,4 @@ RUN mkdir -p ${HOME}/.llama/providers.d ${HOME}/.cache
 COPY redhat-distribution/run.yaml ${APP_ROOT}/run.yaml
 COPY redhat-distribution/providers.d/ ${HOME}/.llama/providers.d/
 
-ENTRYPOINT ["python", "-m", "llama_stack.distribution.server.server", "--config", "/opt/app-root/run.yaml"]
+ENTRYPOINT ["python", "-m", "llama_stack.distribution.server.server", "/opt/app-root/run.yaml"]

redhat-distribution/build.py

@@ -13,7 +13,7 @@
 from pathlib import Path
 
 BASE_REQUIREMENTS = [
-    "llama-stack==0.2.14",
+    "llama-stack==0.2.18",
 ]
 
 
@@ -59,7 +59,7 @@ def check_llama_stack_version():
 
 def get_dependencies():
     """Execute the llama stack build command and capture dependencies."""
-    cmd = "llama stack build --config redhat-distribution/build.yaml --print-deps-only"
+    cmd = "llama stack build redhat-distribution/build.yaml --print-deps-only"
     try:
         result = subprocess.run(cmd, shell=True, capture_output=True, text=True, check=True)
         # Categorize and sort different types of pip install commands

redhat-distribution/run.yaml

@@ -135,4 +135,3 @@ tool_groups:
   provider_id: rag-runtime
 server:
   port: 8321
-external_providers_dir: /opt/app-root/src/.llama/providers.d