reload base image

Author: rbanka1

.github/workflows/ur-precommit.yml

@@ -87,17 +87,17 @@ jobs:
           - name: OPENCL
             runner: UR_OPENCL
             platform: "Intel(R) OpenCL"
-            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
             image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN
           - name: OPENCL
             runner: UR_OPENCL
             platform: "OPENCL:Intel(R) OpenCL"
-            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
             image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN
             other_adapter: NATIVE_CPU
           - name: NATIVE_CPU
             runner: UR_NATIVE_CPU
-            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
             image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
 
         # Extra native CPU jobs are here to force the loader to be used.

devops/containers/ubuntu2204_build.Dockerfile

@@ -30,6 +30,20 @@ RUN apt update && apt install -yqq rocm-dev && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
+COPY unified-runtime/third_party/requirements.txt /tmp/requirements.txt
+RUN apt update && apt install -y python3-venv && \
+    python3 -m venv /opt/unified-runtime/.venv && \
+    /opt/unified-runtime/.venv/bin/pip install --upgrade pip && \
+    /opt/unified-runtime/.venv/bin/pip install -r /tmp/requirements.txt && \
+    rm /tmp/requirements.txt
+
+RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
+    | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
+    echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
+    | tee /etc/apt/sources.list.d/oneAPI.list && \
+    apt-get update && \
+    apt-get install -y intel-oneapi-runtime-opencl intel-oneapi-base-toolkit
+
 COPY scripts/create-sycl-user.sh /user-setup.sh
 RUN /user-setup.sh
 

devops/containers/ubuntu2404_intel_drivers.Dockerfile

@@ -27,13 +27,6 @@ RUN --mount=type=secret,id=github_token \
     fi && \
     GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
 
-RUN echo "Installing Intel OpenCL..." && \
-    wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
-    | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
-    echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \
-    apt-get update && \
-    apt-get install -y intel-oneapi-runtime-opencl intel-oneapi-base-toolkit
-
 COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
 
 USER sycl