AAP-48026: Mechanism to define and retrieve stack version. (#52)

Author: romartin

Containerfile

@@ -1,14 +1,23 @@
+# Build arguments declared in the global scope.
 ARG ANSIBLE_CHATBOT_BASE_IMAGE=ansible-chatbot-stack-base
+ARG ANSIBLE_CHATBOT_VERSION=latest
 ARG LLAMA_STACK_VERSION=0.2.9
 
 FROM ${ANSIBLE_CHATBOT_BASE_IMAGE}:${LLAMA_STACK_VERSION}
 
+# Re-declaring arguments without a value, inherits the global default one.
+ARG ANSIBLE_CHATBOT_VERSION
 ENV LLAMA_STACK_CONFIG_DIR=/.llama/data
 
 # Data and configuration
 RUN mkdir -p /.llama/distributions/ansible-chatbot
 RUN mkdir -p /.llama/data/distributions/ansible-chatbot
 ADD ansible-chatbot-run.yaml /.llama/distributions/ansible-chatbot
+RUN echo -e "\
+{\n\
+  \"version\": \"${ANSIBLE_CHATBOT_VERSION}\" \n\
+}\n\
+" > /.llama/distributions/ansible-chatbot/ansible-chatbot-version-info.json
 RUN chmod -R g+rw /.llama
 
 # Bootstrap

Makefile

@@ -89,9 +89,11 @@ check-env-build-custom:
 		exit 1; \
 	fi
 
-build-custom: check-env-build-custom build
+build-custom: check-env-build-custom
 	@echo "Building customized Ansible Chatbot Stack image..."
-	docker build -f Containerfile -t ansible-chatbot-stack:$(ANSIBLE_CHATBOT_VERSION) --build-arg LLAMA_STACK_VERSION=$(LLAMA_STACK_VERSION) .
+	docker build -f Containerfile -t ansible-chatbot-stack:$(ANSIBLE_CHATBOT_VERSION) \
+		--build-arg ANSIBLE_CHATBOT_VERSION=$(ANSIBLE_CHATBOT_VERSION) \
+		--build-arg LLAMA_STACK_VERSION=$(LLAMA_STACK_VERSION) .
 	@printf "Custom image $(RED)ansible-chatbot-stack:$(ANSIBLE_CHATBOT_VERSION)$(NC) built successfully.\n"
 
 # Pre-check required environment variables for build-lsc
@@ -103,7 +105,9 @@ check-env-build-lsc:
 
 build-lsc: check-env-build-lsc
 	@echo "Building customized Ansible Chatbot Stack image from lightspeed-core/lightspeed-stack..."
-	docker build -f ./lightspeed-stack/Containerfile.lsc -t ansible-chatbot-stack:$(ANSIBLE_CHATBOT_VERSION) .
+	docker build -f ./lightspeed-stack/Containerfile.lsc \
+		--build-arg ANSIBLE_CHATBOT_VERSION=$(ANSIBLE_CHATBOT_VERSION) \
+		-t ansible-chatbot-stack:$(ANSIBLE_CHATBOT_VERSION) .
 	@printf "Custom image $(RED)ansible-chatbot-stack:$(ANSIBLE_CHATBOT_VERSION)$(NC) built successfully.\n"
 
 # Pre-check for required environment variables

lightspeed-stack/Containerfile.lsc

@@ -1,3 +1,6 @@
+# Build arguments declared in the global scope.
+ARG ANSIBLE_CHATBOT_VERSION=latest
+
 # ======================================================
 # Transient image to construct Python venv
 # ------------------------------------------------------
@@ -30,6 +33,8 @@ FROM quay.io/lightspeed-core/lightspeed-stack:latest
 
 USER 0
 
+# Re-declaring arguments without a value, inherits the global default one.
+ARG ANSIBLE_CHATBOT_VERSION
 ARG APP_ROOT=/app-root
 RUN microdnf install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs python3.11
 WORKDIR /app-root
@@ -58,6 +63,11 @@ ENV LLAMA_STACK_CONFIG_DIR=/.llama/data
 RUN mkdir -p /.llama/distributions/ansible-chatbot
 RUN mkdir -p /.llama/data/distributions/ansible-chatbot
 ADD ansible-chatbot-run.yaml /.llama/distributions/ansible-chatbot
+RUN echo -e "\
+{\n\
+  \"version\": \"${ANSIBLE_CHATBOT_VERSION}\" \n\
+}\n\
+" > /.llama/distributions/ansible-chatbot/ansible-chatbot-version-info.json
 ADD llama-stack/providers.d /.llama/providers.d
 RUN chmod -R g+rw /.llama