File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -117,12 +117,11 @@ RUN export DVIM_VER=21.09.06.2 \
117117 && unset DVIM_RPM && unset DVIM_VER
118118# cmake
119119RUN 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
127126COPY scripts/ /usr/local/bpbin
128127COPY git-prompt.sh /etc/profile.d/
Original file line number Diff line number Diff line change @@ -126,12 +126,11 @@ RUN export NJA_VER=1.13.2 \
126126 && unset NJA_DL && unset NJA_VER
127127# cmake
128128RUN 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
136135COPY scripts/ /usr/local/bpbin
137136COPY git-prompt.sh /etc/profile.d/
Original file line number Diff line number Diff line change @@ -116,12 +116,11 @@ RUN export DVIM_VER=21.09.06.2 \
116116 && unset DVIM_RPM && unset DVIM_VER
117117# cmake
118118RUN 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
126125COPY scripts/ /usr/local/bpbin
127126COPY git-prompt.sh /etc/profile.d/
You can’t perform that action at this time.
0 commit comments