This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch v2.4
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/v2.4 by this push:
new a46ac816c fix: fix centos image build (cherry-pick #1356) (#1768)
a46ac816c is described below
commit a46ac816c9e82b7410cf119d5c58add054ba1967
Author: Dan Wang <[email protected]>
AuthorDate: Wed Dec 13 15:05:18 2023 +0800
fix: fix centos image build (cherry-pick #1356) (#1768)
https://github.com/apache/incubator-pegasus/issues/1347
Fix error "ImportError: No module named skbuild" while building CentOS 6
and 7.
This PR is to cherry-pick #1356 to solve #1347.
---
.github/workflows/standardization_lint.yaml | 2 +-
docker/pegasus-build-env/centos6/Dockerfile | 2 +-
docker/pegasus-build-env/centos7/Dockerfile | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/standardization_lint.yaml
b/.github/workflows/standardization_lint.yaml
index 75f394405..0c42be9d0 100644
--- a/.github/workflows/standardization_lint.yaml
+++ b/.github/workflows/standardization_lint.yaml
@@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: hadolint/[email protected]
+ - uses: hadolint/[email protected]
with:
recursive: true
ignore:
'DL3033,DL3013,DL3059,SC2086,DL3003,SC2164,DL3008,DL3007,DL3006,DL4001'
diff --git a/docker/pegasus-build-env/centos6/Dockerfile
b/docker/pegasus-build-env/centos6/Dockerfile
index 8e6c17401..3e042b7d6 100644
--- a/docker/pegasus-build-env/centos6/Dockerfile
+++ b/docker/pegasus-build-env/centos6/Dockerfile
@@ -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 && \
diff --git a/docker/pegasus-build-env/centos7/Dockerfile
b/docker/pegasus-build-env/centos7/Dockerfile
index dad92f6f6..5c536166c 100644
--- a/docker/pegasus-build-env/centos7/Dockerfile
+++ b/docker/pegasus-build-env/centos7/Dockerfile
@@ -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 \
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
