Skip to content

Commit 6161be1

Browse files
committed
docker: cmake 3.31.6 from RPM (externpro/cmake-pkg)
1 parent 048dcfd commit 6161be1

3 files changed

Lines changed: 15 additions & 18 deletions

File tree

public/rocky10-gcc15.dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,11 @@ RUN export DVIM_VER=21.09.06.2 \
117117
&& unset DVIM_RPM && unset DVIM_VER
118118
# cmake
119119
RUN export CMK_VER=3.31.6 \
120-
&& export CMK_SH=cmake-${CMK_VER}-$(uname -s)-$(uname -m).sh \
121-
&& export CMK_DL=releases/download/v${CMK_VER}/${CMK_SH} \
122-
&& wget -q "https://github.com/Kitware/CMake/${CMK_DL}" \
123-
&& sh ./${CMK_SH} --skip-license --prefix=/usr/local/ \
124-
&& rm -f ./${CMK_SH} \
125-
&& unset CMK_DL && unset CMK_SH && unset CMK_VER
120+
&& export CMK_RPM=cmake-pkg-v${CMK_VER}-$(uname -s)-$(uname -m).rpm \
121+
&& wget -q "https://github.com/externpro/cmake-pkg/releases/download/v${CMK_VER}/${CMK_RPM}" \
122+
&& dnf_retry install ./${CMK_RPM} \
123+
&& rm -f ./${CMK_RPM} \
124+
&& unset CMK_RPM && unset CMK_VER
126125
# copy from local into image
127126
COPY scripts/ /usr/local/bpbin
128127
COPY git-prompt.sh /etc/profile.d/

public/rocky8-gcc9.dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,11 @@ RUN export NJA_VER=1.13.2 \
126126
&& unset NJA_DL && unset NJA_VER
127127
# cmake
128128
RUN export CMK_VER=3.31.6 \
129-
&& export CMK_SH=cmake-${CMK_VER}-$(uname -s)-$(uname -m).sh \
130-
&& export CMK_DL=releases/download/v${CMK_VER}/${CMK_SH} \
131-
&& wget -q "https://github.com/Kitware/CMake/${CMK_DL}" \
132-
&& sh ./${CMK_SH} --skip-license --prefix=/usr/local/ \
133-
&& rm -f ./${CMK_SH} \
134-
&& unset CMK_DL && unset CMK_SH && unset CMK_VER
129+
&& export CMK_RPM=cmake-pkg-v${CMK_VER}-$(uname -s)-$(uname -m).rpm \
130+
&& wget -q "https://github.com/externpro/cmake-pkg/releases/download/v${CMK_VER}/${CMK_RPM}" \
131+
&& dnf_retry install ./${CMK_RPM} \
132+
&& rm -f ./${CMK_RPM} \
133+
&& unset CMK_RPM && unset CMK_VER
135134
# copy from local into image
136135
COPY scripts/ /usr/local/bpbin
137136
COPY git-prompt.sh /etc/profile.d/

public/rocky9-gcc13.dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,11 @@ RUN export DVIM_VER=21.09.06.2 \
116116
&& unset DVIM_RPM && unset DVIM_VER
117117
# cmake
118118
RUN export CMK_VER=3.31.6 \
119-
&& export CMK_SH=cmake-${CMK_VER}-$(uname -s)-$(uname -m).sh \
120-
&& export CMK_DL=releases/download/v${CMK_VER}/${CMK_SH} \
121-
&& wget -q "https://github.com/Kitware/CMake/${CMK_DL}" \
122-
&& sh ./${CMK_SH} --skip-license --prefix=/usr/local/ \
123-
&& rm -f ./${CMK_SH} \
124-
&& unset CMK_DL && unset CMK_SH && unset CMK_VER
119+
&& export CMK_RPM=cmake-pkg-v${CMK_VER}-$(uname -s)-$(uname -m).rpm \
120+
&& wget -q "https://github.com/externpro/cmake-pkg/releases/download/v${CMK_VER}/${CMK_RPM}" \
121+
&& dnf_retry install ./${CMK_RPM} \
122+
&& rm -f ./${CMK_RPM} \
123+
&& unset CMK_RPM && unset CMK_VER
125124
# copy from local into image
126125
COPY scripts/ /usr/local/bpbin
127126
COPY git-prompt.sh /etc/profile.d/

0 commit comments

Comments
 (0)