Update cmake version installed in dockerfiles (#25)

* Update cmake version installed in dockerfiles * Standardize the cmake_minimum_required to 3.18.4 across dockerfiles * Fix link to perl repo in opensuse docker. --------- Signed-off-by: David Galiffi <[email protected]>
ROCm · Nov 8, 2024 · cef228b · cef228b
1 parent 7dce592
commit cef228b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/docker/Dockerfile.opensuse b/docker/Dockerfile.opensuse
@@ -23,14 +23,16 @@ RUN set +e; \
 RUN zypper --non-interactive update -y && \
     zypper --non-interactive dist-upgrade -y && \
     zypper --non-interactive install -y -t pattern devel_basis && \
-    zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel gcc-c++ git libnuma-devel openmpi3-devel python3-pip rpm-build wget
+    zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel \
+        gcc-c++ git libnuma-devel openmpi3-devel python3-pip rpm-build wget && \
+    python3 -m pip install 'cmake==3.18.4'
 
 ARG ROCM_VERSION=0.0
 ARG AMDGPU_RPM=6.2/sle/15.6/amdgpu-install-6.2.60200-1.noarch.rpm
-ARG PERL_REPO=SLE_15
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
-        zypper --non-interactive addrepo https://mirrorcache-us.opensuse.org/repositories/devel:/languages:/perl/${PERL_REPO}/devel:languages:perl.repo && \
+        OS_VERSION_MINOR=$(cat /etc/os-release | grep 'VERSION_ID' | sed 's/=/ /1' | awk '{print $NF}' | sed 's/"//g' | sed 's/\./ /g' | awk '{print $2}') && \
+        zypper --non-interactive addrepo https://download.opensuse.org/repositories/devel:languages:perl/15.${OS_VERSION_MINOR}/devel:languages:perl.repo && \
         zypper --non-interactive --no-gpg-checks install -y https://repo.radeon.com/amdgpu-install/${AMDGPU_RPM} && \
         zypper --non-interactive --gpg-auto-import-keys refresh && \
         zypper --non-interactive install -y rocm-dev rocm-smi-lib roctracer-dev rocprofiler-dev rccl-devel libpciaccess0 && \

diff --git a/docker/Dockerfile.opensuse.ci b/docker/Dockerfile.opensuse.ci
@@ -30,7 +30,8 @@ RUN zypper --non-interactive update -y && \
     zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel \
         gcc-c++ git libnuma-devel openmpi3-devel papi-devel python3-pip \
         rpm-build wget && \
-    zypper --non-interactive clean --all
+    zypper --non-interactive clean --all && \
+    python3 -m pip install 'cmake==3.18.4'
 
 COPY ./dyninst-source /tmp/dyninst
 

diff --git a/docker/Dockerfile.rhel b/docker/Dockerfile.rhel
@@ -15,8 +15,10 @@ ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64
 
 RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && crb enable && \
-    yum install -y --allowerasing cmake curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
-    yum clean all
+    yum install -y --allowerasing cmake curl dpkg-devel numactl-devel openmpi-devel \
+        papi-devel python3-pip texinfo wget which zlib-devel && \
+    yum clean all && \
+    python3 -m pip install 'cmake==3.18.4'
 
 ARG ROCM_VERSION=0.0
 ARG AMDGPU_RPM=6.2/rhel/9.4/amdgpu-install-6.2.60202-1.el9.noarch.rpm

diff --git a/docker/Dockerfile.rhel.ci b/docker/Dockerfile.rhel.ci
@@ -21,7 +21,8 @@ RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && crb enable && \
     yum install -y --allowerasing cmake curl dpkg-devel numactl-devel \
         openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
-    yum clean all
+    yum clean all && \
+    python3 -m pip install 'cmake==3.18.4'
 
 COPY ./dyninst-source /tmp/dyninst
 

diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
@@ -24,7 +24,11 @@ ENV PATH ${HOME}/.local/bin:${PATH}
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y apt-utils autoconf autotools-dev bash-completion bison build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 python3-pip rpm texinfo wget
+    apt-get install -y apt-utils autoconf autotools-dev bash-completion bison \
+        build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev \
+        libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 \
+        python3-pip rpm texinfo wget && \
+    python3 -m pip install 'cmake==3.18.4'
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
         wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION}/ubuntu/${ROCM_REPO_DIST}/${AMDGPU_DEB} && \

diff --git a/docker/Dockerfile.ubuntu.ci b/docker/Dockerfile.ubuntu.ci
@@ -29,7 +29,8 @@ RUN apt-get update && \
         bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev \
         libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip texinfo \
         unzip wget zip zlib1g-dev && \
-    apt-get autoclean
+    apt-get autoclean && \
+    python3 -m pip install 'cmake==3.18.4'
 
 COPY ./dyninst-source /tmp/dyninst