Merge pull request #445 from n1hility/fix-scripts

Make sure all scripts are included, fix template issues

training/nvidia-bootc/Containerfile

@@ -149,18 +149,19 @@ 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
 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; \