diff --git a/training/ilab-wrapper/ilab b/training/ilab-wrapper/ilab index e47624fa..fd2e755f 100755 --- a/training/ilab-wrapper/ilab +++ b/training/ilab-wrapper/ilab @@ -16,11 +16,15 @@ if [[ "$1" = "shell" ]]; then export PARAMS=() fi -PODMAN_COMMAND=("podman" "run" "--rm" "-it" +PODMAN_COMMAND=( + "podman" "run" "--rm" "-it" "--device" "${CONTAINER_DEVICE}" "--security-opt" "label=disable" "--net" "host" "-v" "$HOME:$HOME" - "--env" "HOME" + "--storage-opt" "overlay.mount_program=/usr/bin/fuse-overlayfs" + "--storage-opt" "overlay.force_mask=shared" + "--storage-opt" "additionalimagestore=/usr/lib/containers/storage" + "--env" "HOME" "--entrypoint" "$ENTRYPOINT" "--env" "HF_TOKEN" "${IMAGE_NAME}") diff --git a/training/nvidia-bootc/Containerfile b/training/nvidia-bootc/Containerfile index 233fa7bb..f86d79f0 100644 --- a/training/nvidia-bootc/Containerfile +++ b/training/nvidia-bootc/Containerfile @@ -206,13 +206,16 @@ VOLUME /var/lib/containers RUN --mount=type=secret,id=${INSTRUCTLAB_IMAGE_PULL_SECRET}/.dockerconfigjson \ if [ -f "/run/.input/instructlab-nvidia/oci-layout" ]; then \ - IID=$(podman --root /usr/lib/containers/storage pull oci:/run/.input/instructlab-nvidia) && \ + IID=$(podman --root /usr/lib/containers/storage --storage-opt 'overlay.force_mask=shared' --storage-opt 'overlay.mount_program=/usr/bin/fuse-overlayfs' pull oci:/run/.input/instructlab-nvidia) && \ podman --root /usr/lib/containers/storage image tag ${IID} ${INSTRUCTLAB_IMAGE}; \ elif [ -f "/run/secrets/${INSTRUCTLAB_IMAGE_PULL_SECRET}/.dockerconfigjson" ]; then \ - IID=$(sudo podman --root /usr/lib/containers/storage pull --authfile /run/secrets/${INSTRUCTLAB_IMAGE_PULL_SECRET}/.dockerconfigjson ${INSTRUCTLAB_IMAGE}); \ + IID=$(sudo podman --root /usr/lib/containers/storage --storage-opt 'overlay.force_mask=shared' --storage-opt 'overlay.mount_program=/usr/bin/fuse-overlayfs' pull --authfile /run/secrets/${INSTRUCTLAB_IMAGE_PULL_SECRET}/.dockerconfigjson ${INSTRUCTLAB_IMAGE}); \ else \ - IID=$(sudo podman --root /usr/lib/containers/storage pull ${INSTRUCTLAB_IMAGE}); \ - fi + IID=$(sudo podman --root /usr/lib/containers/storage --storage-opt 'overlay.force_mask=shared' --storage-opt 'overlay.mount_program=/usr/bin/fuse-overlayfs' pull ${INSTRUCTLAB_IMAGE}); \ + fi \ + && chmod a+rx -R /usr/lib/containers + RUN podman system reset --force 2>/dev/null LABEL image_version_id="${IMAGE_VERSION_ID}" +