Skip to content

Commit 8ce9965

Browse files
authored
Upgrade Debian version to trixie (#685)
1 parent 7f94988 commit 8ce9965

5 files changed

+14
-14
lines changed

build/base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm
1+
FROM debian:trixie
22

33
ARG port=2222
44

build/base/intel-builder.Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ FROM bash AS downloader
22

33
RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -O key.PUB
44

5-
FROM debian:bookworm
5+
FROM debian:trixie
66

77
COPY --from=downloader key.PUB /tmp/key.PUB
88

99
# Install Intel oneAPI keys.
1010
RUN apt update \
11-
&& apt install -y --no-install-recommends gnupg2 ca-certificates \
12-
&& apt-key add /tmp/key.PUB \
11+
&& apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \
12+
&& gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg /tmp/key.PUB \
1313
&& rm /tmp/key.PUB \
14-
&& echo "deb https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
15-
&& apt remove -y gnupg2 ca-certificates \
16-
&& apt autoremove -y \
14+
&& 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 \
1715
&& apt update \
1816
&& apt install -y --no-install-recommends \
1917
libstdc++-12-dev binutils procps clang \
2018
intel-oneapi-compiler-dpcpp-cpp \
2119
intel-oneapi-mpi-devel-2021.13 \
20+
&& apt remove -y gnupg2 ca-certificates apt-transport-https \
21+
&& apt autoremove -y \
2222
&& rm -rf /var/lib/apt/lists/*
2323

2424
ENV I_MPI_CC=clang I_MPI_CXX=clang++

build/base/intel.Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ COPY --from=downloader key.PUB /tmp/key.PUB
1010

1111
# Install Intel oneAPI keys.
1212
RUN apt update \
13-
&& apt install -y --no-install-recommends gnupg2 ca-certificates \
14-
&& apt-key add /tmp/key.PUB \
13+
&& apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \
14+
&& gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg /tmp/key.PUB \
1515
&& rm /tmp/key.PUB \
16-
&& echo "deb https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
17-
&& apt remove -y gnupg2 ca-certificates \
18-
&& apt autoremove -y \
16+
&& 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 \
1917
&& apt update \
2018
&& apt install -y --no-install-recommends \
2119
dnsutils \
2220
intel-oneapi-mpi-2021.13 \
21+
&& apt remove -y gnupg2 ca-certificates \
22+
&& apt autoremove -y \
2323
&& rm -rf /var/lib/apt/lists/*
2424

2525
COPY entrypoint.sh /entrypoint.sh

build/base/mpich-builder.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm as builder
1+
FROM debian:trixie as builder
22

33
RUN apt update \
44
&& apt install -y --no-install-recommends \

build/base/openmpi-builder.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm as builder
1+
FROM debian:trixie as builder
22

33
RUN apt update \
44
&& apt install -y --no-install-recommends \

0 commit comments

Comments
 (0)