You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by zh...@apache.org on 2023/03/03 10:00:54 UTC
[incubator-pegasus] branch master updated: fix: fix centos image build (#1356)
This is an automated email from the ASF dual-hosted git repository.
zhaoliwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new f628e87a5 fix: fix centos image build (#1356)
f628e87a5 is described below
commit f628e87a5c75dce86b2379202506f3b79042532b
Author: liguohao <48...@users.noreply.github.com>
AuthorDate: Fri Mar 3 18:00:48 2023 +0800
fix: fix centos image build (#1356)
---
.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 623a50006..b97e5ebfb 100644
--- a/.github/workflows/standardization_lint.yaml
+++ b/.github/workflows/standardization_lint.yaml
@@ -67,7 +67,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'
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: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org