From 69fc4d3df0c4c21e542eb7a3b14619d0a2512c37 Mon Sep 17 00:00:00 2001 From: Mateusz Kubica Date: Thu, 22 Jun 2023 14:04:17 +0100 Subject: [PATCH 1/2] Update debian from 11 (bullseye) to 12 (bookworm) --- build/base/Dockerfile | 2 +- build/base/intel-builder.Dockerfile | 8 ++++---- build/base/mpich-builder.Dockerfile | 2 +- build/base/openmpi-builder.Dockerfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/base/Dockerfile b/build/base/Dockerfile index 9e8363c0..af0c21a4 100644 --- a/build/base/Dockerfile +++ b/build/base/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:bookworm ARG port=2222 diff --git a/build/base/intel-builder.Dockerfile b/build/base/intel-builder.Dockerfile index 3510b995..9f8f2638 100644 --- a/build/base/intel-builder.Dockerfile +++ b/build/base/intel-builder.Dockerfile @@ -2,7 +2,7 @@ FROM bash AS downloader RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -O key.PUB -FROM debian:bullseye +FROM debian:bookworm COPY --from=downloader key.PUB /tmp/key.PUB @@ -16,9 +16,9 @@ RUN apt update \ && apt autoremove -y \ && apt update \ && apt install -y --no-install-recommends \ - libstdc++-10-dev binutils procps clang \ - intel-oneapi-compiler-dpcpp-cpp \ - intel-oneapi-mpi-devel \ + libstdc++-11-dev binutils procps clang \ + intel-oneapi-compiler-dpcpp-cpp \ + intel-oneapi-mpi-devel \ && rm -rf /var/lib/apt/lists/* ENV I_MPI_CC=clang I_MPI_CXX=clang++ diff --git a/build/base/mpich-builder.Dockerfile b/build/base/mpich-builder.Dockerfile index 5880b8aa..d6f25e93 100644 --- a/build/base/mpich-builder.Dockerfile +++ b/build/base/mpich-builder.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye as builder +FROM debian:bookworm as builder RUN apt update \ && apt install -y --no-install-recommends \ diff --git a/build/base/openmpi-builder.Dockerfile b/build/base/openmpi-builder.Dockerfile index 5cec38b2..a548d519 100644 --- a/build/base/openmpi-builder.Dockerfile +++ b/build/base/openmpi-builder.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye as builder +FROM debian:bookworm as builder RUN apt update \ && apt install -y --no-install-recommends \ From 9175bf61dbace4ab6f442b9be1439bf8e1e54277 Mon Sep 17 00:00:00 2001 From: Mateusz Kubica Date: Thu, 22 Jun 2023 14:47:08 +0100 Subject: [PATCH 2/2] Fix formatting --- test/e2e/mpi_job_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/mpi_job_test.go b/test/e2e/mpi_job_test.go index 85791bfb..c4ffdb29 100644 --- a/test/e2e/mpi_job_test.go +++ b/test/e2e/mpi_job_test.go @@ -216,7 +216,7 @@ var _ = ginkgo.Describe("MPIJob", func() { }) ginkgo.When("running as non-root", func() { - ginkgo.BeforeEach(func () { + ginkgo.BeforeEach(func() { mpiJob.Spec.SSHAuthMountPath = "/home/mpiuser/.ssh" mpiJob.Spec.MPIReplicaSpecs[kubeflow.MPIReplicaTypeLauncher].Template.Spec.Containers[0].SecurityContext = &corev1.SecurityContext{ @@ -283,7 +283,7 @@ var _ = ginkgo.Describe("MPIJob", func() { }) ginkgo.When("running as non-root", func() { - ginkgo.BeforeEach(func () { + ginkgo.BeforeEach(func() { mpiJob.Spec.SSHAuthMountPath = "/home/mpiuser/.ssh" mpiJob.Spec.MPIReplicaSpecs[kubeflow.MPIReplicaTypeLauncher].Template.Spec.Containers[0].SecurityContext = &corev1.SecurityContext{