Merge pull request #585 from fabiendupont/bootc-intel-multistage

Use multi-stage to build the Intel bootc image
containers · Jun 19, 2024 · fcd7e7a · fcd7e7a
2 parents cb8cc3c + 744a03e
commit fcd7e7a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 45 deletions.
diff --git a/training/intel-bootc/Containerfile b/training/intel-bootc/Containerfile
@@ -1,62 +1,56 @@
+ARG DRIVER_TOOLKIT_IMAGE="quay.io/ai-lab/nvidia-builder:latest"
 ARG BASEIMAGE="quay.io/centos-bootc/centos-bootc:stream9"
-FROM ${BASEIMAGE}
 
-ARG OS_VERSION_MAJOR=''
-ARG DRIVER_VERSION=1.16.0-526
-ARG TARGET_ARCH=''
-ARG KERNEL_VERSION=''
-ARG REDHAT_VERSION='el9'
+FROM ${DRIVER_TOOLKIT_IMAGE} as builder
+
+ARG DRIVER_VERSION=1.16.1-7
 ARG HABANA_REPO="https://vault.habana.ai/artifactory/rhel/9/9.2"
-ARG KERNEL_DIR="/usr/lib/modules/${KERNEL_VERSION}.el9_4.x86_64/build"
-ARG KERNEL_FULL_VER="${KERNEL_VERSION}.el9_4.x86"
 
+WORKDIR /home/builder
 
 RUN . /etc/os-release \
-    && export OS_VERSION_MAJOR="${OS_VERSION_MAJOR:-$(echo ${VERSION} | cut -d'.' -f 1)}" \
-    && export TARGET_ARCH="${TARGET_ARCH:-$(arch)}" \
-    && dnf -y update && dnf -y install kernel-headers${KERNEL_VERSION:+-}${KERNEL_VERSION}.el9_4 \
-       kernel-devel${KERNEL_VERSION:+-}${KERNEL_VERSION}.el9_4 \
-       kernel-devel-matched${KERNEL_VERSION:+-}${KERNEL_VERSION}.el9_4 \
-       kernel-modules${KERNEL_VERSION:+-}${KERNEL_VERSION}.el9_4 \
-       elfutils-libelf-devel gcc make git kmod rsync \
-       vim-filesystem rpm-build wget ninja-build pciutils tmux \
-    && rpm -ivh https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/pandoc-common-2.14.0.3-17.el9.noarch.rpm \
-    && rpm -ivh https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/pandoc-2.14.0.3-17.el9.x86_64.rpm \
-    && dnf -y clean all \
-    && cd sources \
-    && wget ${HABANA_REPO}/habanalabs-firmware-${DRIVER_VERSION}.${REDHAT_VERSION}.${TARGET_ARCH}.rpm \
-    ${HABANA_REPO}/habanalabs-${DRIVER_VERSION}.${REDHAT_VERSION}.noarch.rpm \
-    ${HABANA_REPO}/habanalabs-rdma-core-${DRIVER_VERSION}.${REDHAT_VERSION}.noarch.rpm \
-    ${HABANA_REPO}/habanalabs-firmware-tools-${DRIVER_VERSION}.${REDHAT_VERSION}.${TARGET_ARCH}.rpm \
-    ${HABANA_REPO}/habanalabs-thunk-${DRIVER_VERSION}.${REDHAT_VERSION}.${TARGET_ARCH}.rpm \ 
-    && rpm2cpio habanalabs-firmware-${DRIVER_VERSION}.${REDHAT_VERSION}.${TARGET_ARCH}.rpm | cpio -idmv \
-    && rpm2cpio habanalabs-${DRIVER_VERSION}.${REDHAT_VERSION}.noarch.rpm | cpio -idmv \
-    && rpm2cpio habanalabs-rdma-core-${DRIVER_VERSION}.${REDHAT_VERSION}.noarch.rpm | cpio -idmv \
-    && rpm2cpio habanalabs-firmware-tools-${DRIVER_VERSION}.${REDHAT_VERSION}.${TARGET_ARCH}.rpm | cpio -idmv \
-    && rpm2cpio habanalabs-thunk-${DRIVER_VERSION}.${REDHAT_VERSION}.${TARGET_ARCH}.rpm | cpio -idmv \ 
-    && rm *.rpm \
-    && cp -r /sources/etc/* /etc/ \
-    && cp -r /sources/lib/* /lib/ \
-    && cp -r /sources/usr/* /usr/ \
-    && cp -r /sources/opt/* /opt/
+    && export OS_VERSION_MAJOR=$(echo ${VERSION} | cut -d'.' -f 1) \
+    && export KERNEL_VERSION=$(rpm -q --qf '%{VERSION}-%{RELEASE}' kernel-core) \
+    && export TARGET_ARCH=$(rpm -q --qf '%{ARCH}' kernel-core) \
+    && rpm2cpio ${HABANA_REPO}/habanalabs-firmware-${DRIVER_VERSION}.el${OS_VERSION_MAJOR}.${TARGET_ARCH}.rpm | cpio -idmv \
+    && rpm2cpio ${HABANA_REPO}/habanalabs-${DRIVER_VERSION}.el${OS_VERSION_MAJOR}.noarch.rpm | cpio -idmv \
+    && rpm2cpio ${HABANA_REPO}/habanalabs-rdma-core-${DRIVER_VERSION}.el${OS_VERSION_MAJOR}.noarch.rpm | cpio -idmv \
+    && rpm2cpio ${HABANA_REPO}/habanalabs-firmware-tools-${DRIVER_VERSION}.el${OS_VERSION_MAJOR}.${TARGET_ARCH}.rpm | cpio -idmv \
+    && rpm2cpio ${HABANA_REPO}/habanalabs-thunk-${DRIVER_VERSION}.el${OS_VERSION_MAJOR}.${TARGET_ARCH}.rpm | cpio -idmv \ 
+    && pushd usr/src/habanalabs-${DRIVER_VERSION} \
+    && make -f Makefile.nic KVERSION=${KERNEL_VERSION}.${TARGET_ARCH} \
+    && make -f Makefile KVERSION=${KERNEL_VERSION}.${TARGET_ARCH} \
+    && pushd drivers/infiniband/hw/hbl \
+    && make KVERSION=${KERNEL_VERSION}.${TARGET_ARCH}
+
+FROM ${BASEIMAGE}
 
-WORKDIR /usr/src/habanalabs-${DRIVER_VERSION}
-RUN make -f Makefile.nic && make -f Makefile && cd drivers/infiniband/hw/hlib && make
-RUN mkdir /lib/modules/${KERNEL_VERSION}.el9_4.x86_64/extra
-RUN cp drivers/accel/habanalabs/habanalabs.ko /lib/modules/${KERNEL_VERSION}.el9_4.x86_64/extra/ \
-    && cp drivers/infiniband/hw/hlib/habanalabs_ib.ko /lib/modules/${KERNEL_VERSION}.el9_4.x86_64/extra/ \
-    && cp drivers/net/ethernet/intel/hl_cn/habanalabs_cn.ko /lib/modules/${KERNEL_VERSION}.el9_4.x86_64/extra/ \
-    && cp drivers/net/ethernet/intel/hl_en/habanalabs_en.ko /lib/modules/${KERNEL_VERSION}.el9_4.x86_64/extra/
+ARG DRIVER_VERSION=1.16.1-7
+ARG EXTRA_RPM_PACKAGES=''
 
-RUN depmod -a ${KERNEL_VERSION}
+COPY --from=builder /home/builder/usr/src/habanalabs-${DRIVER_VERSION}/drivers/accel/habanalabs/habanalabs.ko /tmp/extra/habanalabs.ko
+COPY --from=builder /home/builder/usr/src/habanalabs-${DRIVER_VERSION}/drivers/infiniband/hw/hbl/habanalabs_ib.ko /tmp/extra/habanalabs_ib.ko
+COPY --from=builder /home/builder/usr/src/habanalabs-${DRIVER_VERSION}/drivers/net/ethernet/intel/hbl_cn/habanalabs_cn.ko /tmp/extra/habanalabs_cn.ko
+COPY --from=builder /home/builder/usr/src/habanalabs-${DRIVER_VERSION}/drivers/net/ethernet/intel/hbl_en/habanalabs_en.ko /tmp/extra/habanalabs_en.ko
+COPY --from=builder /home/builder/lib/firmware/habanalabs /tmp/firmware/habanalabs
+
+RUN . /etc/os-release \
+    && export OS_VERSION_MAJOR=$(echo ${VERSION} | cut -d'.' -f 1) \
+    && export KERNEL_VERSION=$(rpm -q --qf '%{VERSION}-%{RELEASE}' kernel-core) \
+    && export TARGET_ARCH=$(rpm -q --qf '%{ARCH}' kernel-core) \
+    && mv /tmp/extra /lib/modules/${KERNEL_VERSION}.${TARGET_ARCH} \
+    && mv /tmp/firmware/habanalabs /lib/firmware \
+    && depmod -a ${KERNEL_VERSION}.${TARGET_ARCH}
+
+RUN dnf install -y rsync ${EXTRA_RPM_PACKAGES} \
+    && dnf clean all
 
 # Include growfs service
 COPY build/usr /usr
 
 ARG INSTRUCTLAB_IMAGE="quay.io/ai-lab/instructlab-intel:latest"
 ARG VLLM_IMAGE="quay.io/ai-lab/vllm:latest"
 
-
 ARG SSHPUBKEY
 
 # The --build-arg "SSHPUBKEY=$(cat ~/.ssh/id_rsa.pub)" option inserts your

diff --git a/training/intel-bootc/Makefile b/training/intel-bootc/Makefile
@@ -13,7 +13,6 @@ bootc: growfs prepare-files
 		$(EXTRA_RPM_PACKAGES:%=--build-arg EXTRA_RPM_PACKAGES=%) \
 		$(FROM:%=--build-arg BASEIMAGE=%) \
 		$(INSTRUCTLAB_IMAGE:%=--build-arg INSTRUCTLAB_IMAGE=%) \
-		$(KERNEL_VERSION:%=--build-arg KERNEL_VERSION=%) \
 		$(SOURCE_DATE_EPOCH:%=--timestamp=%) \
 		$(VLLM_IMAGE:%=--build-arg VLLM_IMAGE=%) \
 		$(SSH_PUBKEY:%=--build-arg SSHPUBKEY=%) \