From c1a72521be48c52d8e053318753548e1e376264f Mon Sep 17 00:00:00 2001 From: Vikas Saxena Date: Thu, 17 Apr 2025 08:02:24 +1000 Subject: [PATCH] # This is a combination of 5 commits. # This is the 1st commit message: fixed based with kustomize edit fix Signed-off-by: Vikas Saxena fixed overlays/kubeflow with kustomize edit fix Signed-off-by: Vikas Saxena fixed overlays/standalone with kustomize edit fix Signed-off-by: Vikas Saxena updated gpg signature for intel image Signed-off-by: Vikas Saxena updating new intel oneAPI key Signed-off-by: Vikas Saxena replacing curl by wget as the underling image doesnt have curl Signed-off-by: Vikas Saxena # This is the commit message #2: Revert "replacing curl by wget as the underling image doesnt have curl" This reverts commit bdc579846939476ca092bdde5a8ec3ccc81a67c8. Signed-off-by: Vikas Saxena # This is the commit message #3: Revert "updating new intel oneAPI key" This reverts commit 6cb0042f0f764a4352f5c8590177a275e696056e. Signed-off-by: Vikas Saxena # This is the commit message #4: updaung the key intel gpg key Signed-off-by: Vikas Saxena # This is the commit message #5: adding fix for key Signed-off-by: Vikas Saxena --- build/base/intel.Dockerfile | 12 ++++++++++++ examples/v2beta1/pi/intel.Dockerfile | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/build/base/intel.Dockerfile b/build/base/intel.Dockerfile index 6456e6e..e83694f 100644 --- a/build/base/intel.Dockerfile +++ b/build/base/intel.Dockerfile @@ -2,6 +2,7 @@ ARG BASE_LABEL FROM bash AS downloader +# switch to use the new gpg key RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -O key.PUB FROM mpioperator/base:${BASE_LABEL} @@ -10,6 +11,7 @@ COPY --from=downloader key.PUB /tmp/key.PUB # Install Intel oneAPI keys. RUN apt update \ +<<<<<<< HEAD && apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \ && gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg /tmp/key.PUB \ && rm /tmp/key.PUB \ @@ -17,7 +19,17 @@ RUN apt update \ # REF: https://github.com/kubeflow/mpi-operator/issues/691 && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg trusted=yes] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \ && apt update \ +======= +>>>>>>> db26b7e (Revert "updating new intel oneAPI key") && apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \ + && gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg /tmp/key.PUB \ + && rm /tmp/key.PUB \ + && 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 update \ + && apt install -y --no-install-recommends \ + dnsutils \ + intel-oneapi-mpi-2021.13 \ + && apt remove -y gnupg2 ca-certificates \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* diff --git a/examples/v2beta1/pi/intel.Dockerfile b/examples/v2beta1/pi/intel.Dockerfile index b1009a5..abddce8 100644 --- a/examples/v2beta1/pi/intel.Dockerfile +++ b/examples/v2beta1/pi/intel.Dockerfile @@ -3,7 +3,7 @@ ARG BASE_LABEL FROM mpioperator/intel-builder:${BASE_LABEL} as builder # Add Intel repository key and update apt sources -RUN curl -fsSL https://apt.repos.intel.com/oneapi/gpgkey | gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg \ +RUN curl -fsSL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg \ && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \ > /etc/apt/sources.list.d/oneapi.list \ && apt update \