kubeflow
/
mpi-operator
mirror of https://github.com/kubeflow/mpi-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

# This is a combination of 5 commits. 

# This is the 1st commit message:

fixed based with kustomize edit fix

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

fixed overlays/kubeflow with kustomize edit fix

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

fixed overlays/standalone with kustomize edit fix

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

updated gpg signature for intel image

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

updating new intel oneAPI key

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

replacing curl by wget as the underling image doesnt have curl

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

# 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 <Vikas.Saxena.2006@gmail.com>

# This is the commit message #3:

Revert "updating new intel oneAPI key"

This reverts commit 6cb0042f0f764a4352f5c8590177a275e696056e.

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

# This is the commit message #4:

updaung the key intel gpg key

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>

# This is the commit message #5:

adding fix for key

Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>
This commit is contained in:
Vikas Saxena 2025-04-17 08:02:24 +10:00
parent 0c331b7cb6
commit c1a72521be
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/base/intel.Dockerfile
View File

@ -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/*

2
examples/v2beta1/pi/intel.Dockerfile
View File

@ -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 \