Skip to content

Commit 9700c70

Browse files
authored
Merge pull request #1800 from anik120/fix-llama-stack-container-start-issue
LCORE-1872: Fix llama-stack container startup issues
2 parents 7503ebd + 5dd5008 commit 9700c70

4 files changed

Lines changed: 10 additions & 9 deletions

File tree

deploy/llama-stack/test.containerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# Upstream llama-stack built from Red Hat UBI
2-
FROM registry.access.redhat.com/ubi9/ubi-minimal
1+
# Upstream llama-stack built from Red Hat UBI Python 3.12 image
2+
FROM registry.access.redhat.com/ubi9/python-312
33

44
USER root
55

6-
# Install Python and build tools
7-
RUN microdnf install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs \
8-
python3.12 python3.12-devel python3.12-pip git tar gcc gcc-c++ make
6+
# Install additional build tools
7+
RUN dnf install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs \
8+
git tar gcc gcc-c++ make && \
9+
dnf clean all
910

1011
# Install uv
1112
ENV PATH="/root/.local/bin:${PATH}"

scripts/llama-stack-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
set -e
66

77
INPUT_CONFIG="${LLAMA_STACK_CONFIG:-/opt/app-root/run.yaml}"
8-
ENRICHED_CONFIG="/opt/app-root/run.yaml"
8+
ENRICHED_CONFIG="/tmp/enriched-run.yaml"
99
LIGHTSPEED_CONFIG="${LIGHTSPEED_CONFIG:-/opt/app-root/lightspeed-stack.yaml}"
1010

1111
# Enrich config if lightspeed config exists
1212
if [ -f "$LIGHTSPEED_CONFIG" ]; then
1313
echo "Enriching llama-stack config..."
1414
ENRICHMENT_FAILED=0
15-
python3 /opt/app-root/llama_stack_configuration.py \
15+
/opt/app-root/.venv/bin/python3 /opt/app-root/llama_stack_configuration.py \
1616
-c "$LIGHTSPEED_CONFIG" \
1717
-i "$INPUT_CONFIG" \
1818
-o "$ENRICHED_CONFIG" 2>&1 || ENRICHMENT_FAILED=1

tests/e2e-prow/rhoai/manifests/lightspeed/llama-stack-openai.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ spec:
157157
if [[ -f "$LIGHTSPEED_CONFIG" ]]; then
158158
echo "Enriching llama-stack config..."
159159
ENRICHMENT_FAILED=0
160-
python3 /opt/app-root/llama_stack_configuration.py \
160+
/opt/app-root/.venv/bin/python3 /opt/app-root/llama_stack_configuration.py \
161161
-c "$LIGHTSPEED_CONFIG" \
162162
-i "$INPUT_CONFIG" \
163163
-o "$ENRICHED_CONFIG" 2>&1 || ENRICHMENT_FAILED=1

tests/e2e-prow/rhoai/manifests/lightspeed/llama-stack-prow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ spec:
147147
if [[ -f "$LIGHTSPEED_CONFIG" ]]; then
148148
echo "Enriching llama-stack config..."
149149
ENRICHMENT_FAILED=0
150-
python3 /opt/app-root/src/llama_stack_configuration.py \
150+
/opt/app-root/.venv/bin/python3 /opt/app-root/src/llama_stack_configuration.py \
151151
-c "$LIGHTSPEED_CONFIG" \
152152
-i "$INPUT_CONFIG" \
153153
-o "$ENRICHED_CONFIG" 2>&1 || ENRICHMENT_FAILED=1

0 commit comments

Comments
 (0)