fixes the Containerfile (#74)

Fixes the Containerfile to use the latest image from lightspeed-stack
issue: https://issues.redhat.com/browse/AAP-50401

Signed-off-by: Djebran Lezzoum <[email protected]>

Author: ldjebran

Containerfile

@@ -4,11 +4,9 @@ ARG ANSIBLE_CHATBOT_VERSION=latest
 # ======================================================
 # Transient image to construct Python venv
 # ------------------------------------------------------
-FROM registry.access.redhat.com/ubi9/ubi-minimal AS builder
+FROM quay.io/lightspeed-core/lightspeed-stack:dev-latest AS builder
 
 ARG APP_ROOT=/app-root
-RUN microdnf install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs \
-    python3.12 python3.12-devel python3.12-pip
 WORKDIR /app-root
 
 # UV_PYTHON_DOWNLOADS=0 : Disable Python interpreter downloads and use the system interpreter.
@@ -21,17 +19,15 @@ RUN pip3.12 install uv
 
 # Add explicit files and directories
 # (avoid accidental inclusion of local directories or env files or credentials)
-COPY pyproject.toml uv.lock LICENSE.md README.md ./
+COPY requirements.txt LICENSE.md README.md ./
 
-RUN uv sync --locked --no-install-project --no-dev
+RUN uv pip install -r requirements.txt
 # ======================================================
 
 # ======================================================
-# Final image without uv package manager
+# Final image without uv package manager and based on lightspeed-stack base image
 # ------------------------------------------------------
-#FROM quay.io/lightspeed-core/lightspeed-stack:dev-latest
-# the lastest was broken, replace by the latest working image for now
-FROM quay.io/lightspeed-core/lightspeed-stack:dev-20250722-28abfaf
+FROM registry.access.redhat.com/ubi9/python-312-minimal
 
 USER 0
 
@@ -50,14 +46,11 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONIOENCODING=UTF-8 \
     LANG=en_US.UTF-8
 
-COPY --from=builder /app-root /app-root
+COPY --from=builder --chown=1001:1001 /app-root /app-root
 
 # this directory is checked by ecosystem-cert-preflight-checks task in Konflux
 COPY --from=builder /app-root/LICENSE.md /licenses/
 
-# Add executables from .venv to system PATH
-ENV PATH="/app-root/.venv/bin:$PATH"
-
 ENV LLAMA_STACK_CONFIG_DIR=/.llama/data
 
 # Data and configuration
@@ -69,14 +62,21 @@ RUN echo -e "\
 }\n\
 " > /.llama/distributions/ansible-chatbot/ansible-chatbot-version-info.json
 ADD llama-stack/providers.d /.llama/providers.d
-RUN chmod -R g+rw /.llama
 
 # Bootstrap
 ADD entrypoint.sh /.llama
+
+RUN chmod -R g+rw /.llama
 RUN chmod +x /.llama/entrypoint.sh
 
-# See https://github.com/meta-llama/llama-stack/issues/1633
-# USER 1001
+RUN chown -R 1001:1001 /.llama
+
+USER 1001
+
+# Add executables from .venv to system PATH
+
+ENV PATH="/app-root/.venv/bin:$PATH"
+LABEL vendor="Red Hat, Inc."
 
-ENTRYPOINT ["/.llama/entrypoint.sh"]
+ENTRYPOINT ["/.llama/entrypoint.sh", "/app-root/.venv/bin/python3.12"]
 # ======================================================

Makefile

@@ -68,6 +68,10 @@ setup-vector-db:
 	docker cp rag-content:/rag/embeddings_model .
 	docker kill rag-content
 	gzip -d ./vector_db/aap_faiss_store.db.gz
+	# this permission changes will allow the container user 1001 to read/write the files
+	# in these directories
+	chmod -R o+rw ./vector_db/
+	chmod -R o+rw ./embeddings_model/
 
 # Pre-check required environment variables for build
 check-env-build:
@@ -76,9 +80,12 @@ check-env-build:
 		exit 1; \
 	fi
 
-build: check-env-build
+requirements:
+	uv export --no-hashes --no-header --no-annotate --no-dev --format requirements.txt > requirements.txt
+
+build: check-env-build requirements
 	@echo "Building customized Ansible Chatbot Stack image from lightspeed-core/lightspeed-stack..."
-	docker build --platform $(PLATFORM) -f ./Containerfile \
+	docker build --no-cache --platform $(PLATFORM) -f ./Containerfile \
 		--build-arg ANSIBLE_CHATBOT_VERSION=$(ANSIBLE_CHATBOT_VERSION) \
 		--build-arg LLAMA_STACK_RUN_CONFIG=$(LLAMA_STACK_RUN_CONFIG) \
 		-t ansible-chatbot-stack:$(ANSIBLE_CHATBOT_VERSION) .

entrypoint.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 MOUNTPATH=/.llama/data
 
+PYTHON_CMD="$@"
+
 echo "Checking preloaded embedding model..."
 if [[ -e /.llama/data/distributions/ansible-chatbot/embeddings_model ]]; then
   echo "/.llama/data/distributions/ansible-chatbot/embeddings_model already exists."
@@ -23,4 +25,4 @@ else
   fi
 fi
 
-python3.12 /app-root/src/lightspeed_stack.py --config /.llama/distributions/ansible-chatbot/config/lightspeed-stack.yaml
+${PYTHON_CMD} /app-root/src/lightspeed_stack.py --config /.llama/distributions/ansible-chatbot/config/lightspeed-stack.yaml

pyproject.toml

@@ -9,7 +9,6 @@ dependencies = [
     "faiss-cpu~=1.11.0",
     "fire~=0.7.0",
     "lightspeed-stack-providers~=0.1.10",
-    "llama-stack==0.2.14",
     "mcp~=1.9.4",
     "numpy==2.2.6",
     "opentelemetry-api~=1.34.1",

requirements.txt

@@ -0,0 +1,121 @@
+aiohappyeyeballs==2.6.1
+aiohttp==3.12.13
+aiosignal==1.3.2
+aiosqlite==0.21.0
+annotated-types==0.7.0
+anyio==4.9.0
+asyncpg==0.30.0
+attrs==25.3.0
+certifi==2025.6.15
+charset-normalizer==3.4.2
+click==8.2.1
+colorama==0.4.6 ; sys_platform == 'win32'
+distro==1.9.0
+ecdsa==0.19.1
+faiss-cpu==1.11.0
+fastapi==0.115.13
+filelock==3.18.0
+fire==0.7.0
+frozenlist==1.7.0
+fsspec==2025.5.1
+googleapis-common-protos==1.70.0
+greenlet==3.2.3 ; (python_full_version < '3.14' and platform_machine == 'AMD64') or (python_full_version < '3.14' and platform_machine == 'WIN32') or (python_full_version < '3.14' and platform_machine == 'aarch64') or (python_full_version < '3.14' and platform_machine == 'amd64') or (python_full_version < '3.14' and platform_machine == 'ppc64le') or (python_full_version < '3.14' and platform_machine == 'win32') or (python_full_version < '3.14' and platform_machine == 'x86_64')
+grpcio==1.73.0
+h11==0.16.0
+hf-xet==1.1.5 ; platform_machine == 'aarch64' or platform_machine == 'amd64' or platform_machine == 'arm64' or platform_machine == 'x86_64'
+httpcore==1.0.9
+httpx==0.28.1
+httpx-sse==0.4.1
+huggingface-hub==0.33.0
+idna==3.10
+importlib-metadata==8.7.0
+jinja2==3.1.6
+jiter==0.10.0
+joblib==1.5.1
+jsonschema==4.24.0
+jsonschema-specifications==2025.4.1
+lightspeed-stack-providers==0.1.10
+llama-stack==0.2.14
+llama-stack-client==0.2.15
+markdown-it-py==3.0.0
+markupsafe==3.0.2
+mcp==1.9.4
+mdurl==0.1.2
+mpmath==1.3.0
+multidict==6.5.0
+networkx==3.5
+numpy==2.2.6
+nvidia-cublas-cu12==12.6.4.1 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cuda-cupti-cu12==12.6.80 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cuda-nvrtc-cu12==12.6.77 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cuda-runtime-cu12==12.6.77 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cudnn-cu12==9.5.1.17 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cufft-cu12==11.3.0.4 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cufile-cu12==1.11.1.6 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-curand-cu12==10.3.7.77 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cusolver-cu12==11.7.1.2 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cusparse-cu12==12.5.4.2 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-cusparselt-cu12==0.6.3 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-nccl-cu12==2.26.2 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-nvjitlink-cu12==12.6.85 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+nvidia-nvtx-cu12==12.6.77 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+openai==1.91.0
+opentelemetry-api==1.34.1
+opentelemetry-exporter-otlp==1.34.1
+opentelemetry-exporter-otlp-proto-common==1.34.1
+opentelemetry-exporter-otlp-proto-grpc==1.34.1
+opentelemetry-exporter-otlp-proto-http==1.34.1
+opentelemetry-proto==1.34.1
+opentelemetry-sdk==1.34.1
+opentelemetry-semantic-conventions==0.55b1
+packaging==25.0
+pandas==2.3.0
+pillow==11.2.1
+prompt-toolkit==3.0.51
+propcache==0.3.2
+protobuf==5.29.5
+pyaml==25.5.0
+pyasn1==0.6.1
+pydantic==2.11.7
+pydantic-core==2.33.2
+pydantic-settings==2.10.1
+pygments==2.19.2
+python-dateutil==2.9.0.post0
+python-dotenv==1.1.1
+python-jose==3.5.0
+python-multipart==0.0.20
+pytz==2025.2
+pyyaml==6.0.2
+referencing==0.36.2
+regex==2024.11.6
+requests==2.32.4
+rich==14.0.0
+rpds-py==0.25.1
+rsa==4.9.1
+safetensors==0.5.3
+scikit-learn==1.7.0
+scipy==1.16.0
+sentence-transformers==5.0.0
+setuptools==80.9.0
+six==1.17.0
+sniffio==1.3.1
+sqlalchemy==2.0.41
+sse-starlette==2.3.6
+starlette==0.46.2
+sympy==1.14.0
+termcolor==3.1.0
+threadpoolctl==3.6.0
+tiktoken==0.9.0
+tokenizers==0.21.2
+torch==2.7.1
+tqdm==4.67.1
+transformers==4.53.1
+triton==3.3.1 ; platform_machine == 'x86_64' and sys_platform == 'linux'
+typing-extensions==4.14.0
+typing-inspection==0.4.1
+tzdata==2025.2
+urllib3==2.5.0
+uvicorn==0.34.3
+wcwidth==0.2.13
+yarl==1.20.1
+zipp==3.23.0