Skip to content

Commit 20c2636

Browse files
atheo89atheo89
authored
Merge pull request #2272 from atheo89/dnf-update
Replace yum with dnf to have better consistency among the Dockerfiles
2 parents 410b27d + 00d9f61 commit 20c2636

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎base-images/cuda/12.6/c9s-python-3.11/Dockerfile.cuda‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ RUN NVIDIA_GPGKEY_SUM=d0664fbbdb8c32356d45de36c5984617217b2d0bef41b93ccecd326ba3
3737
ENV CUDA_VERSION=12.6.3
3838

3939
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
40-
RUN yum upgrade -y && yum install -y \
40+
RUN dnf upgrade -y && dnf install -y \
4141
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
4242
cuda-compat-12-6 \
43-
&& yum clean all \
43+
&& dnf clean all \
4444
&& rm -rf /var/cache/yum/*
4545

4646
# nvidia-docker 1.0
@@ -67,20 +67,20 @@ ENV NV_LIBNCCL_VERSION=2.23.4
6767
ENV NCCL_VERSION=2.23.4
6868
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
6969

70-
RUN yum install -y \
70+
RUN dnf install -y \
7171
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
7272
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
7373
${NV_LIBNPP_PACKAGE} \
7474
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
7575
${NV_LIBNCCL_PACKAGE} \
76-
&& yum clean all \
76+
&& dnf clean all \
7777
&& rm -rf /var/cache/yum/*
7878

7979
# Install devel tools
80-
RUN yum install -y \
80+
RUN dnf install -y \
8181
make \
8282
findutils \
83-
&& yum clean all \
83+
&& dnf clean all \
8484
&& rm -rf /var/cache/yum/*
8585

8686
# Install CUDA cudnn9 from:
@@ -90,17 +90,17 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
9090

9191
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
9292

93-
RUN yum install -y \
93+
RUN dnf install -y \
9494
${NV_CUDNN_PACKAGE} \
95-
&& yum clean all \
95+
&& dnf clean all \
9696
&& rm -rf /var/cache/yum/*
9797

9898
# Set this flag so that libraries can find the location of CUDA
9999
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
100100

101101
# Install CUDA toolkit 12.6
102-
RUN yum -y install cuda-toolkit-12-6 && \
103-
yum -y clean all --enablerepo="*"
102+
RUN dnf -y install cuda-toolkit-12-6 && \
103+
dnf -y clean all --enablerepo="*"
104104

105105
# Restore user workspace
106106
USER 1001

‎base-images/cuda/12.6/c9s-python-3.12/Dockerfile.cuda‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ RUN NVIDIA_GPGKEY_SUM=d0664fbbdb8c32356d45de36c5984617217b2d0bef41b93ccecd326ba3
3737
ENV CUDA_VERSION=12.6.3
3838

3939
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
40-
RUN yum upgrade -y && yum install -y \
40+
RUN dnf upgrade -y && dnf install -y \
4141
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
4242
cuda-compat-12-6 \
43-
&& yum clean all \
43+
&& dnf clean all \
4444
&& rm -rf /var/cache/yum/*
4545

4646
# nvidia-docker 1.0
@@ -67,20 +67,20 @@ ENV NV_LIBNCCL_VERSION=2.23.4
6767
ENV NCCL_VERSION=2.23.4
6868
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
6969

70-
RUN yum install -y \
70+
RUN dnf install -y \
7171
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
7272
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
7373
${NV_LIBNPP_PACKAGE} \
7474
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
7575
${NV_LIBNCCL_PACKAGE} \
76-
&& yum clean all \
76+
&& dnf clean all \
7777
&& rm -rf /var/cache/yum/*
7878

7979
# Install devel tools
80-
RUN yum install -y \
80+
RUN dnf install -y \
8181
make \
8282
findutils \
83-
&& yum clean all \
83+
&& dnf clean all \
8484
&& rm -rf /var/cache/yum/*
8585

8686
# Install CUDA cudnn9 from:
@@ -90,17 +90,17 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
9090

9191
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
9292

93-
RUN yum install -y \
93+
RUN dnf install -y \
9494
${NV_CUDNN_PACKAGE} \
95-
&& yum clean all \
95+
&& dnf clean all \
9696
&& rm -rf /var/cache/yum/*
9797

9898
# Set this flag so that libraries can find the location of CUDA
9999
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
100100

101101
# Install CUDA toolkit 12.6
102-
RUN yum -y install cuda-toolkit-12-6 && \
103-
yum -y clean all --enablerepo="*"
102+
RUN dnf -y install cuda-toolkit-12-6 && \
103+
dnf -y clean all --enablerepo="*"
104104

105105
# Restore user workspace
106106
USER 1001

‎base-images/cuda/12.6/ubi9-python-3.12/Dockerfile.cuda‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ RUN NVIDIA_GPGKEY_SUM=d0664fbbdb8c32356d45de36c5984617217b2d0bef41b93ccecd326ba3
3737
ENV CUDA_VERSION=12.6.3
3838

3939
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
40-
RUN yum upgrade -y && yum install -y \
40+
RUN dnf upgrade -y && dnf install -y \
4141
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
4242
cuda-compat-12-6 \
43-
&& yum clean all \
43+
&& dnf clean all \
4444
&& rm -rf /var/cache/yum/*
4545

4646
# nvidia-docker 1.0
@@ -67,20 +67,20 @@ ENV NV_LIBNCCL_VERSION=2.23.4
6767
ENV NCCL_VERSION=2.23.4
6868
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
6969

70-
RUN yum install -y \
70+
RUN dnf install -y \
7171
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
7272
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
7373
${NV_LIBNPP_PACKAGE} \
7474
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
7575
${NV_LIBNCCL_PACKAGE} \
76-
&& yum clean all \
76+
&& dnf clean all \
7777
&& rm -rf /var/cache/yum/*
7878

7979
# Install devel tools
80-
RUN yum install -y \
80+
RUN dnf install -y \
8181
make \
8282
findutils \
83-
&& yum clean all \
83+
&& dnf clean all \
8484
&& rm -rf /var/cache/yum/*
8585

8686
# Install CUDA cudnn9 from:
@@ -90,9 +90,9 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
9090

9191
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
9292

93-
RUN yum install -y \
93+
RUN dnf install -y \
9494
${NV_CUDNN_PACKAGE} \
95-
&& yum clean all \
95+
&& dnf clean all \
9696
&& rm -rf /var/cache/yum/*
9797

9898
# Set this flag so that libraries can find the location of CUDA

‎base-images/rocm/6.2/c9s-python-3.12/Dockerfile.rocm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RUN echo "[ROCm]" > /etc/yum.repos.d/rocm.repo && \
3232
echo "baseurl=https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/rhel/9.4/main/x86_64" >> /etc/yum.repos.d/amdgpu.repo && \
3333
echo "enabled=1" >> /etc/yum.repos.d/amdgpu.repo && \
3434
echo "gpgcheck=0" >> /etc/yum.repos.d/amdgpu.repo && \
35-
yum install -y rocm-developer-tools rocm-ml-sdk rocm-opencl-sdk rocm-openmp-sdk rocm-utils && \
36-
yum clean all && rm -rf /var/cache/yum
35+
dnf install -y rocm-developer-tools rocm-ml-sdk rocm-opencl-sdk rocm-openmp-sdk rocm-utils && \
36+
dnf clean all && rm -rf /var/cache/yum
3737

3838
# Restore user workspace
3939
USER 1001

‎base-images/rocm/6.2/ubi9-python-3.12/Dockerfile.rocm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RUN echo "[ROCm]" > /etc/yum.repos.d/rocm.repo && \
3232
echo "baseurl=https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/rhel/9.4/main/x86_64" >> /etc/yum.repos.d/amdgpu.repo && \
3333
echo "enabled=1" >> /etc/yum.repos.d/amdgpu.repo && \
3434
echo "gpgcheck=0" >> /etc/yum.repos.d/amdgpu.repo && \
35-
yum install -y rocm-developer-tools rocm-ml-sdk rocm-opencl-sdk rocm-openmp-sdk rocm-utils && \
36-
yum clean all && rm -rf /var/cache/yum
35+
dnf install -y rocm-developer-tools rocm-ml-sdk rocm-opencl-sdk rocm-openmp-sdk rocm-utils && \
36+
dnf clean all && rm -rf /var/cache/yum
3737

3838
# Restore user workspace
3939
USER 1001

0 commit comments

Comments
 (0)