Skip to content

Commit ea4a62f

Browse files
jiridanekjiridanek
authored
[rhds] Issue opendatahub-io#2157: chore(Dockerfiles): replace yum with dnf consistently across UBI9 Dockerfiles (opendatahub-io#1514)
* opendatahub-io#2185
1 parent 39ca491 commit ea4a62f

File tree

13 files changed

+71
-71
lines changed

13 files changed

+71
-71
lines changed

‎codeserver/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ WORKDIR /opt/app-root/bin
4949
RUN dnf install -y jq git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
5050

5151
# Install code-server
52-
RUN yum install -y "https://github.com/coder/code-server/releases/download/${CODESERVER_VERSION}/code-server-${CODESERVER_VERSION/v/}-${TARGETARCH}.rpm" && \
53-
yum -y clean all --enablerepo='*'
52+
RUN dnf install -y "https://github.com/coder/code-server/releases/download/${CODESERVER_VERSION}/code-server-${CODESERVER_VERSION/v/}-${TARGETARCH}.rpm" && \
53+
dnf -y clean all --enablerepo='*'
5454

5555
COPY --chown=1001:0 ${CODESERVER_SOURCE_CODE}/utils utils/
5656

@@ -71,11 +71,11 @@ ENV NGINX_VERSION=1.24 \
7171
NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
7272

7373
# Modules does not exist
74-
RUN yum install -y https://download.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
74+
RUN dnf install -y https://download.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
7575
INSTALL_PKGS="bind-utils nginx nginx-mod-stream nginx-mod-http-perl fcgiwrap initscripts chkconfig supervisor" && \
76-
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
76+
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
7777
rpm -V $INSTALL_PKGS && \
78-
yum -y clean all --enablerepo='*'
78+
dnf -y clean all --enablerepo='*'
7979

8080
COPY --chown=1001:0 ${CODESERVER_SOURCE_CODE}/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
8181

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.cuda‎

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

6565
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
66-
RUN yum upgrade -y && yum install -y \
66+
RUN dnf upgrade -y && dnf install -y \
6767
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
6868
cuda-compat-12-6 \
69-
&& yum clean all \
69+
&& dnf clean all \
7070
&& rm -rf /var/cache/yum/*
7171

7272
# nvidia-docker 1.0
@@ -93,21 +93,21 @@ ENV NV_LIBNCCL_VERSION=2.23.4
9393
ENV NCCL_VERSION=2.23.4
9494
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
9595

96-
RUN yum install -y \
96+
RUN dnf install -y \
9797
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
9898
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
9999
${NV_LIBNPP_PACKAGE} \
100100
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
101101
${NV_LIBNCCL_PACKAGE} \
102-
&& yum clean all \
102+
&& dnf clean all \
103103
&& rm -rf /var/cache/yum/*
104104

105105
# Install devel tools
106106

107-
RUN yum install -y \
107+
RUN dnf install -y \
108108
make \
109109
findutils \
110-
&& yum clean all \
110+
&& dnf clean all \
111111
&& rm -rf /var/cache/yum/*
112112

113113
# Install CUDA cudnn9 from:
@@ -117,9 +117,9 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
117117

118118
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
119119

120-
RUN yum install -y \
120+
RUN dnf install -y \
121121
${NV_CUDNN_PACKAGE} \
122-
&& yum clean all \
122+
&& dnf clean all \
123123
&& rm -rf /var/cache/yum/*
124124

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

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.rocm‎

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

6363
# Restore notebook user workspace
6464
USER 1001

‎jupyter/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.konflux.cuda‎

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

7878
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
79-
RUN yum upgrade -y && yum install -y \
79+
RUN dnf upgrade -y && dnf install -y \
8080
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
8181
cuda-compat-12-6 \
82-
&& yum clean all \
82+
&& dnf clean all \
8383
&& rm -rf /var/cache/yum/*
8484

8585
# nvidia-docker 1.0
@@ -106,21 +106,21 @@ ENV NV_LIBNCCL_VERSION=2.23.4
106106
ENV NCCL_VERSION=2.23.4
107107
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
108108

109-
RUN yum install -y \
109+
RUN dnf install -y \
110110
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
111111
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
112112
${NV_LIBNPP_PACKAGE} \
113113
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
114114
${NV_LIBNCCL_PACKAGE} \
115-
&& yum clean all \
115+
&& dnf clean all \
116116
&& rm -rf /var/cache/yum/*
117117

118118
# Install devel tools
119119

120-
RUN yum install -y \
120+
RUN dnf install -y \
121121
make \
122122
findutils \
123-
&& yum clean all \
123+
&& dnf clean all \
124124
&& rm -rf /var/cache/yum/*
125125

126126
# Install CUDA cudnn9 from:
@@ -130,9 +130,9 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
130130

131131
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
132132

133-
RUN yum install -y \
133+
RUN dnf install -y \
134134
${NV_CUDNN_PACKAGE} \
135-
&& yum clean all \
135+
&& dnf clean all \
136136
&& rm -rf /var/cache/yum/*
137137

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

‎jupyter/pytorch/ubi9-python-3.12/Dockerfile.konflux.cuda‎

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

7878
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
79-
RUN yum upgrade -y && yum install -y \
79+
RUN dnf upgrade -y && dnf install -y \
8080
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
8181
cuda-compat-12-6 \
82-
&& yum clean all \
82+
&& dnf clean all \
8383
&& rm -rf /var/cache/yum/*
8484

8585
# nvidia-docker 1.0
@@ -106,21 +106,21 @@ ENV NV_LIBNCCL_VERSION=2.23.4
106106
ENV NCCL_VERSION=2.23.4
107107
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
108108

109-
RUN yum install -y \
109+
RUN dnf install -y \
110110
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
111111
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
112112
${NV_LIBNPP_PACKAGE} \
113113
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
114114
${NV_LIBNCCL_PACKAGE} \
115-
&& yum clean all \
115+
&& dnf clean all \
116116
&& rm -rf /var/cache/yum/*
117117

118118
# Install devel tools
119119

120-
RUN yum install -y \
120+
RUN dnf install -y \
121121
make \
122122
findutils \
123-
&& yum clean all \
123+
&& dnf clean all \
124124
&& rm -rf /var/cache/yum/*
125125

126126
# Install CUDA cudnn9 from:
@@ -130,9 +130,9 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
130130

131131
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
132132

133-
RUN yum install -y \
133+
RUN dnf install -y \
134134
${NV_CUDNN_PACKAGE} \
135-
&& yum clean all \
135+
&& dnf clean all \
136136
&& rm -rf /var/cache/yum/*
137137

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

‎jupyter/rocm/pytorch/ubi9-python-3.12/Dockerfile.konflux.rocm‎

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

7676
# Restore notebook user workspace
7777
USER 1001

‎jupyter/tensorflow/ubi9-python-3.12/Dockerfile.konflux.cuda‎

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

7878
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
79-
RUN yum upgrade -y && yum install -y \
79+
RUN dnf upgrade -y && dnf install -y \
8080
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
8181
cuda-compat-12-6 \
82-
&& yum clean all \
82+
&& dnf clean all \
8383
&& rm -rf /var/cache/yum/*
8484

8585
# nvidia-docker 1.0
@@ -106,21 +106,21 @@ ENV NV_LIBNCCL_VERSION=2.23.4
106106
ENV NCCL_VERSION=2.23.4
107107
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
108108

109-
RUN yum install -y \
109+
RUN dnf install -y \
110110
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
111111
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
112112
${NV_LIBNPP_PACKAGE} \
113113
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
114114
${NV_LIBNCCL_PACKAGE} \
115-
&& yum clean all \
115+
&& dnf clean all \
116116
&& rm -rf /var/cache/yum/*
117117

118118
# Install devel tools
119119

120-
RUN yum install -y \
120+
RUN dnf install -y \
121121
make \
122122
findutils \
123-
&& yum clean all \
123+
&& dnf clean all \
124124
&& rm -rf /var/cache/yum/*
125125

126126
# Install CUDA cudnn9 from:
@@ -130,9 +130,9 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
130130

131131
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
132132

133-
RUN yum install -y \
133+
RUN dnf install -y \
134134
${NV_CUDNN_PACKAGE} \
135-
&& yum clean all \
135+
&& dnf clean all \
136136
&& rm -rf /var/cache/yum/*
137137

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

‎jupyter/trustyai/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ USER 0
115115

116116
# Install jre that is needed to run the trustyai library
117117
RUN INSTALL_PKGS="java-17-openjdk" && \
118-
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
119-
yum -y clean all --enablerepo='*'
118+
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
119+
dnf -y clean all --enablerepo='*'
120120

121121
USER 1001
122122

‎runtimes/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.konflux.cuda‎

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

6565
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
66-
RUN yum upgrade -y && yum install -y \
66+
RUN dnf upgrade -y && dnf install -y \
6767
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
6868
cuda-compat-12-6 \
69-
&& yum clean all \
69+
&& dnf clean all \
7070
&& rm -rf /var/cache/yum/*
7171

7272
# nvidia-docker 1.0
@@ -93,21 +93,21 @@ ENV NV_LIBNCCL_VERSION=2.23.4
9393
ENV NCCL_VERSION=2.23.4
9494
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
9595

96-
RUN yum install -y \
96+
RUN dnf install -y \
9797
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
9898
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
9999
${NV_LIBNPP_PACKAGE} \
100100
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
101101
${NV_LIBNCCL_PACKAGE} \
102-
&& yum clean all \
102+
&& dnf clean all \
103103
&& rm -rf /var/cache/yum/*
104104

105105
# Install devel tools
106106

107-
RUN yum install -y \
107+
RUN dnf install -y \
108108
make \
109109
findutils \
110-
&& yum clean all \
110+
&& dnf clean all \
111111
&& rm -rf /var/cache/yum/*
112112

113113
# Install CUDA cudnn9 from:
@@ -117,9 +117,9 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
117117

118118
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
119119

120-
RUN yum install -y \
120+
RUN dnf install -y \
121121
${NV_CUDNN_PACKAGE} \
122-
&& yum clean all \
122+
&& dnf clean all \
123123
&& rm -rf /var/cache/yum/*
124124

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

‎runtimes/pytorch/ubi9-python-3.12/Dockerfile.konflux.cuda‎

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

6565
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
66-
RUN yum upgrade -y && yum install -y \
66+
RUN dnf upgrade -y && dnf install -y \
6767
cuda-cudart-12-6-${NV_CUDA_CUDART_VERSION} \
6868
cuda-compat-12-6 \
69-
&& yum clean all \
69+
&& dnf clean all \
7070
&& rm -rf /var/cache/yum/*
7171

7272
# nvidia-docker 1.0
@@ -93,21 +93,21 @@ ENV NV_LIBNCCL_VERSION=2.23.4
9393
ENV NCCL_VERSION=2.23.4
9494
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.6
9595

96-
RUN yum install -y \
96+
RUN dnf install -y \
9797
cuda-libraries-12-6-${NV_CUDA_LIB_VERSION} \
9898
cuda-nvtx-12-6-${NV_NVTX_VERSION} \
9999
${NV_LIBNPP_PACKAGE} \
100100
libcublas-12-6-${NV_LIBCUBLAS_VERSION} \
101101
${NV_LIBNCCL_PACKAGE} \
102-
&& yum clean all \
102+
&& dnf clean all \
103103
&& rm -rf /var/cache/yum/*
104104

105105
# Install devel tools
106106

107-
RUN yum install -y \
107+
RUN dnf install -y \
108108
make \
109109
findutils \
110-
&& yum clean all \
110+
&& dnf clean all \
111111
&& rm -rf /var/cache/yum/*
112112

113113
# Install CUDA cudnn9 from:
@@ -117,9 +117,9 @@ ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
117117

118118
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
119119

120-
RUN yum install -y \
120+
RUN dnf install -y \
121121
${NV_CUDNN_PACKAGE} \
122-
&& yum clean all \
122+
&& dnf clean all \
123123
&& rm -rf /var/cache/yum/*
124124

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

0 commit comments

Comments
 (0)