Skip to content

Commit ac9a12e

Browse files
authored
Add manylinux_2_28 image - fix cmake (#1817)
* Manylinux 2_28 fix cmake install * fix
1 parent b121fe6 commit ac9a12e

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/build-manywheel-images.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
paths:
1313
- .github/workflows/build-manywheel-images.yml
1414
- manywheel/Dockerfile
15+
- manywheel/Dockerfile_2_28
1516
- manywheel/Dockerfile_aarch64
1617
- manywheel/Dockerfile_cuda_aarch64
1718
- manywheel/Dockerfile_cxx11-abi
@@ -21,6 +22,7 @@ on:
2122
paths:
2223
- .github/workflows/build-manywheel-images.yml
2324
- manywheel/Dockerfile
25+
- manywheel/Dockerfile_2_28
2426
- manywheel/Dockerfile_aarch64
2527
- manywheel/Dockerfile_cuda_aarch64
2628
- manywheel/Dockerfile_cxx11-abi

manywheel/Dockerfile_2_28

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ENV LD_LIBRARY_PATH=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/op
1616
# cmake-3.18.4 from pip
1717
RUN yum install -y python3-pip && \
1818
python3 -mpip install cmake==3.18.4 && \
19-
ln -s /usr/local/bin/cmake /usr/bin/cmake
19+
ln -s /usr/local/bin/cmake /usr/bin/cmake3
2020

2121
FROM base as openssl
2222
# Install openssl (this must precede `build python` step)
@@ -119,10 +119,11 @@ ARG DEVTOOLSET_VERSION=11
119119
# Ensure the expected devtoolset is used
120120
ENV PATH=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/bin:$PATH
121121
ENV LD_LIBRARY_PATH=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib:$LD_LIBRARY_PATH
122-
# cmake
123-
RUN yum install -y cmake3 && \
124-
ln -s /usr/bin/cmake3 /usr/bin/cmake
125122

123+
# cmake-3.18.4 from pip
124+
RUN yum install -y python3-pip && \
125+
python3 -mpip install cmake==3.18.4 && \
126+
ln -s /usr/local/bin/cmake /usr/bin/cmake3
126127

127128
FROM cpu_final as cuda_final
128129
RUN rm -rf /usr/local/cuda-${BASE_CUDA_VERSION}

0 commit comments

Comments
 (0)