From a730e92a6c476e4fb015c39c7d23928cf0ad32ae Mon Sep 17 00:00:00 2001 From: root Date: Thu, 2 May 2024 11:59:56 -0500 Subject: [PATCH] Make sure all scripts are included, fix template issues Signed-off-by: Jason T. Greene --- training/nvidia-bootc/Containerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/training/nvidia-bootc/Containerfile b/training/nvidia-bootc/Containerfile index 785f6fd2..e42ac472 100644 --- a/training/nvidia-bootc/Containerfile +++ b/training/nvidia-bootc/Containerfile @@ -149,7 +149,8 @@ RUN set -eu; mkdir -p /usr/ssh && \ RUN grep -q /usr/lib/containers/storage /etc/containers/storage.conf || \ sed -i -e '/additionalimage.*/a "/usr/lib/containers/storage",' \ /etc/containers/storage.conf && \ - cp /run/.input/ilab /usr/local/bin/ilab + cp /run/.input/ilab* /usr/local/bin/ + ARG INSTRUCTLAB_IMAGE ARG INSTRUCTLAB_IMAGE_ID @@ -157,10 +158,10 @@ ARG VLLM_IMAGE ARG VLLM_IMAGE_ID ARG TRAIN_IMAGE ARG TRAIN_IMAGE_ID -ARG GPU_COUNT_COMMAND='nvidia-ctk --quiet cdi list | grep -P nvidia.com/gpu=\d+ | wc -l' +ARG GPU_COUNT_COMMAND='nvidia-ctk --quiet cdi list | grep -P nvidia.com/gpu=\\d+ | wc -l' RUN for i in /usr/local/bin/ilab*; do \ - sed -i 's/__REPLACE_TRAIN_DEVICE__/cudai/' $i; \ + sed -i 's/__REPLACE_TRAIN_DEVICE__/cuda/' $i; \ sed -i 's/__REPLACE_CONTAINER_DEVICE__/nvidia.com\/gpu=all/' $i; \ sed -i "s%__REPLACE_IMAGE_NAME__%${INSTRUCTLAB_IMAGE}%" $i; \ sed -i "s%__REPLACE_VLLM_NAME__%${VLLM_IMAGE}%" $i; \