Skip to content

Commit

Permalink
fix: fix centos image build (cherry-pick #1356) (#1768)
Browse files Browse the repository at this point in the history
#1347

Fix error "ImportError: No module named skbuild" while building CentOS 6 and 7.

This PR is to cherry-pick #1356 to solve #1347.
  • Loading branch information
empiredan authored Dec 13, 2023
1 parent 0a6b743 commit a46ac81
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/standardization_lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: hadolint/hadolint-action@v2.1.0
- uses: hadolint/hadolint-action@v3.1.0
with:
recursive: true
ignore: 'DL3033,DL3013,DL3059,SC2086,DL3003,SC2164,DL3008,DL3007,DL3006,DL4001'
Expand Down
2 changes: 1 addition & 1 deletion docker/pegasus-build-env/centos6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ENV MAVEN_HOME=/opt/rh/rh-maven33/root/usr/
ENV PATH=$MAVEN_HOME/bin:$JAVA_HOME/bin:$GCC_HOME/bin:$PYTHON2_HOME/bin/:$PATH
ENV LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/amd64/server:$PYTHON2_HOME/lib64/:$LD_LIBRARY_PATH

RUN pip install --no-cache-dir cmake
RUN python -m pip install --user --upgrade pip==20.3.4 && python -m pip install --no-cache-dir cmake -i https://pypi.tuna.tsinghua.edu.cn/simple

RUN wget --progress=dot:giga https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift && \
cd /opt/thrift && tar xzf 0.11.0.tar.gz && cd thrift-0.11.0 && ./bootstrap.sh && \
Expand Down
5 changes: 3 additions & 2 deletions docker/pegasus-build-env/centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ RUN yum -y install centos-release-scl \
yum clean all; \
rm -rf /var/cache/yum;

RUN pip3 install --no-cache-dir cmake
ENV PATH="/opt/rh/devtoolset-7/root/bin/:${PATH}"

RUN pip3 install --upgrade pip --no-cache-dir && pip3 install --no-cache-dir cmake -i https://pypi.tuna.tsinghua.edu.cn/simple

RUN wget --progress=dot:giga https://archive.apache.org/dist/maven/maven-3/3.8.3/binaries/apache-maven-3.8.3-bin.tar.gz -P /opt/maven \
&& cd /opt/maven \
Expand All @@ -68,7 +70,6 @@ RUN wget --progress=dot:giga https://github.com/apache/thrift/archive/refs/tags/
rm -rf thrift-0.11.0 0.11.0.tar.gz

ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
ENV PATH="/opt/rh/devtoolset-7/root/bin/:${PATH}"
ENV PATH="/opt/maven/apache-maven-3.8.3/bin:${PATH}"

WORKDIR /root/apache

0 comments on commit a46ac81

Please sign in to comment.