From bf965d38e211942ad30c6de74d7024a670acd85c Mon Sep 17 00:00:00 2001 From: "Jason T. Greene" Date: Sat, 22 Jun 2024 01:57:10 -0500 Subject: [PATCH] Revert "Change source from ilab wrapper" This reverts commit 528ae444c0b9071c412219ce329a51b10b68e220. Signed-off-by: Jason T. Greene --- training/amd-bootc/Containerfile | 5 ++--- training/nvidia-bootc/Containerfile | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/training/amd-bootc/Containerfile b/training/amd-bootc/Containerfile index cf4e13a3..a2e05cb3 100644 --- a/training/amd-bootc/Containerfile +++ b/training/amd-bootc/Containerfile @@ -22,10 +22,9 @@ RUN dnf install -y \ # Setup /usr/lib/containers/storage as an additional store for images. # Remove once the base images have this set by default. RUN sed -i -e '/additionalimage.*/a "/usr/lib/containers/storage",' \ - /etc/containers/storage.conf + /etc/containers/storage.conf && \ + cp /run/.input/ilab /usr/local/bin/ilab -COPY ../ilab-wrapper/ilab /usr/local/bin/ilab - ARG INSTRUCTLAB_IMAGE="quay.io/ai-lab/instructlab-amd:latest" ARG SSHPUBKEY diff --git a/training/nvidia-bootc/Containerfile b/training/nvidia-bootc/Containerfile index e06e8a88..38ebe905 100644 --- a/training/nvidia-bootc/Containerfile +++ b/training/nvidia-bootc/Containerfile @@ -156,9 +156,8 @@ fi # Also make sure not to duplicate if a base image already has it specified. RUN grep -q /usr/lib/containers/storage /etc/containers/storage.conf || \ sed -i -e '/additionalimage.*/a "/usr/lib/containers/storage",' \ - /etc/containers/storage.conf - -COPY ../ilab-wrapper/ilab /usr/local/bin/ilab + /etc/containers/storage.conf && \ + cp /run/.input/ilab /usr/local/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"