You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by la...@apache.org on 2023/02/14 07:27:22 UTC

[incubator-pegasus] branch support_ubuntu2204_clang14 updated: fix

This is an automated email from the ASF dual-hosted git repository.

laiyingchun pushed a commit to branch support_ubuntu2204_clang14
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git


The following commit(s) were added to refs/heads/support_ubuntu2204_clang14 by this push:
     new c3964c016 fix
c3964c016 is described below

commit c3964c01673e137ffb583357f262124c98eb279e
Author: Yingchun Lai <la...@apache.org>
AuthorDate: Tue Feb 14 15:27:13 2023 +0800

    fix
---
 docker/pegasus-build-env/centos6/Dockerfile    | 1 -
 docker/pegasus-build-env/ubuntu1604/Dockerfile | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/pegasus-build-env/centos6/Dockerfile b/docker/pegasus-build-env/centos6/Dockerfile
index 515a62856..8e6c17401 100644
--- a/docker/pegasus-build-env/centos6/Dockerfile
+++ b/docker/pegasus-build-env/centos6/Dockerfile
@@ -76,7 +76,6 @@ 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 --upgrade pip
 RUN pip install --no-cache-dir cmake
 
 RUN wget --progress=dot:giga https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift && \
diff --git a/docker/pegasus-build-env/ubuntu1604/Dockerfile b/docker/pegasus-build-env/ubuntu1604/Dockerfile
index 6735f5053..eaba65f6a 100644
--- a/docker/pegasus-build-env/ubuntu1604/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu1604/Dockerfile
@@ -58,6 +58,12 @@ RUN add-apt-repository ppa:git-core/ppa -y; \
     apt-get install git pkg-config -y --no-install-recommends; \
     rm -rf /var/lib/apt/lists/*
 
+RUN add-apt-repository ppa:deadsnakes/ppa -y; \
+    apt-get update -y; \
+    apt-get install python3.8 -y --no-install-recommends; \
+    rm -rf /var/lib/apt/lists/* \
+
+RUN update-alternatives  --set python /usr/bin/python3.8
 RUN pip3 install --no-cache-dir --upgrade pip
 RUN pip3 install --no-cache-dir cmake
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org