Fixup intel builds

ubuntu/intel/Dockerfile

@@ -1,10 +1,23 @@
 ARG ubuntu_version
-FROM ghcr.io/llnl/radiuss-ubuntu:$ubuntu_version
+FROM ghcr.io/llnl/radiuss:ubuntu-$ubuntu_version
 
 # Install intel-oneapi with spack
 ARG intel_version
 ENV intel_version=$intel_version
 
-RUN spack add intel-oneapi-compilers@${intel_version} && spack install
-RUN spack view --dependencies no symlink --ignore-conflicts /opt/view intel-oneapi-compilers@${intel_version} && \
-  spack compiler find
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN \
+    sudo mkdir --parents --mode=0755 /etc/apt/keyrings \
+    && wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo 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" | sudo tee /etc/apt/sources.list.d/oneAPI.list \
+    && apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends intel-hpckit-${intel_version} \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
+
+USER radiuss
+
+RUN echo 'source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null' >> ~/.bashrc
+
+WORKDIR /home/radiuss

ubuntu/intel/uptodate.yaml

@@ -1,16 +1,19 @@
 dockerbuild:
+  container_basename: radiuss
+
+  matrix:
+    intel_version:
+      - "2023.1.0"
+      - "2024.0"
+    ubuntu_version:
+      - "20.04"
+      - "20.04"
+
   build_args:
     intel_version:
       key: intel
-      name: intel-oneapi-compilers
-      type: spack
-      startat: "2021.2.0"
+      name: intel
 
-    # Look for ubuntu versions for our base builds
     ubuntu_version:
       key: ubuntu
-      name: ghcr.io/llnl/ubuntu
-      type: container
-      startat: "20.04"
-      filter: 
-        - "^[0-9]+[.]04$"
+      name: ubuntu