You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/03/06 03:25:28 UTC
[4/5] thrift git commit: THRIFT-3696 Install pip to CentOS Docker
images to fix Python builds
THRIFT-3696 Install pip to CentOS Docker images to fix Python builds
This closes #912
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/ed23b2b4
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/ed23b2b4
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/ed23b2b4
Branch: refs/heads/master
Commit: ed23b2b4ce796602ac073ec07582b9a19f5f02e4
Parents: 5fb1fda
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Sun Feb 28 13:47:44 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sun Mar 6 09:46:22 2016 +0900
----------------------------------------------------------------------
.travis.yml | 6 +++---
build/docker/centos/Dockerfile | 2 +-
build/docker/centos6/Dockerfile | 5 +++--
build/docker/debian/Dockerfile | 3 ++-
build/docker/ubuntu/Dockerfile | 7 ++++---
5 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/ed23b2b4/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 6b99965..10da1f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,14 +110,14 @@ env:
BUILD_ARG="-DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF"
BUILD_ENV=""
- - TEST_NAME="All (CentOS)"
+ - TEST_NAME="All - GCC (CentOS)"
BUILD_CMD="../cmake.sh"
+ BUILD_ENV="-e CC=gcc -e CXX=g++"
DISTRO=centos
- - TEST_NAME="C C++ - GCC (CentOS)"
+ - TEST_NAME="C C++ - Clang (CentOS)"
BUILD_CMD="../cmake.sh"
BUILD_ARG="-DWITH_PYTHON=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
- BUILD_ENV="-e CC=gcc -e CXX=g++"
DISTRO=centos
- TEST_NAME="Python 2.6 (CentOS 6)"
http://git-wip-us.apache.org/repos/asf/thrift/blob/ed23b2b4/build/docker/centos/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/centos/Dockerfile b/build/docker/centos/Dockerfile
index 4ce4f42..011ccc0 100644
--- a/build/docker/centos/Dockerfile
+++ b/build/docker/centos/Dockerfile
@@ -58,7 +58,7 @@ RUN yum install -y \
python-devel \
python-setuptools \
python-twisted-web \
- python-six
+ python-pip
# Ruby Dependencies
RUN yum install -y \
http://git-wip-us.apache.org/repos/asf/thrift/blob/ed23b2b4/build/docker/centos6/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/centos6/Dockerfile b/build/docker/centos6/Dockerfile
index 0e571c5..33d5dad 100644
--- a/build/docker/centos6/Dockerfile
+++ b/build/docker/centos6/Dockerfile
@@ -19,7 +19,8 @@
FROM centos:6
MAINTAINER Apache Thrift <de...@thrift.apache.org>
-RUN yum install -y \
+RUN yum install -y epel-release && \
+ yum install -y \
autoconf \
bison \
bison-devel \
@@ -36,7 +37,7 @@ RUN yum install -y \
python-devel \
python-setuptools \
python-twisted-web \
- python-six \
+ python-pip \
&& yum clean all
# CMake
http://git-wip-us.apache.org/repos/asf/thrift/blob/ed23b2b4/build/docker/debian/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/debian/Dockerfile b/build/docker/debian/Dockerfile
index b6cf4fb..a85d9e1 100644
--- a/build/docker/debian/Dockerfile
+++ b/build/docker/debian/Dockerfile
@@ -55,7 +55,7 @@ RUN apt-get update && apt-get install -y \
&& update-java-alternatives -s java-1.7.0-openjdk-amd64
# Python dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
python-all \
python-all-dev \
python-all-dbg \
@@ -64,6 +64,7 @@ RUN apt-get update && apt-get install -y \
python-twisted \
python-zope.interface \
python-pip \
+ python3-dev \
python3-pip
# Ruby dependencies
http://git-wip-us.apache.org/repos/asf/thrift/blob/ed23b2b4/build/docker/ubuntu/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile
index 44ad147..5180fca 100644
--- a/build/docker/ubuntu/Dockerfile
+++ b/build/docker/ubuntu/Dockerfile
@@ -55,15 +55,16 @@ RUN apt-get update && apt-get install -y \
&& update-java-alternatives -s java-1.7.0-openjdk-amd64
# Python dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
python-all \
- python-all-dev \
python-all-dbg \
+ python-all-dev \
+ python-pip \
python-setuptools \
python-support \
python-twisted \
python-zope.interface \
- python-pip \
+ python3-dev \
python3-pip
# Ruby dependencies