From ea29d0d3a82d68f9f3b190e080068607f693d27c Mon Sep 17 00:00:00 2001 From: reidliu Date: Fri, 28 Feb 2025 06:54:30 +0800 Subject: [PATCH] chore: add container cmd check Signed-off-by: reidliu --- llama_stack/distribution/build_container.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/llama_stack/distribution/build_container.sh b/llama_stack/distribution/build_container.sh index 08941a538..4d5ebb92f 100755 --- a/llama_stack/distribution/build_container.sh +++ b/llama_stack/distribution/build_container.sh @@ -47,6 +47,9 @@ CONTAINER_OPTS=${CONTAINER_OPTS:-} TEMP_DIR=$(mktemp -d) +SCRIPT_DIR=$(dirname "$(readlink -f "$0")") +source "$SCRIPT_DIR/common.sh" + add_to_container() { local input output_file="$TEMP_DIR/Containerfile" @@ -58,6 +61,12 @@ add_to_container() { fi } +# Check if container command is available +if ! is_command_available $CONTAINER_BINARY; then + printf "${RED}Error: ${CONTAINER_BINARY} command not found. Is ${CONTAINER_BINARY} installed and in your PATH?${NC}" >&2 + exit 1 +fi + # Update and install UBI9 components if UBI9 base image is used if [[ $container_base == *"registry.access.redhat.com/ubi9"* ]]; then add_to_container << EOF @@ -202,7 +211,7 @@ if [ "$USE_COPY_NOT_MOUNT" != "true" ]; then fi fi -if command -v selinuxenabled &>/dev/null && selinuxenabled; then +if is_command_available selinuxenabled && selinuxenabled; then # Disable SELinux labels -- we don't want to relabel the llama-stack source dir CONTAINER_OPTS="$CONTAINER_OPTS --security-opt label=disable" fi