aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-08 15:42:59 -0800
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-11 14:51:25 -0800
commit96aec2d3212ac9cfba88e0e5c066977a4ca0dbb5 (patch)
treedf44399e3c4b8f968951edc031dba277537528c5 /tools/dockerfile
parent5d0cce34feabc73cd1af622d846f707f2aecee90 (diff)
fix python centos6 distribtest
Diffstat (limited to 'tools/dockerfile')
-rw-r--r--tools/dockerfile/distribtest/python_centos6_x64/Dockerfile16
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/dockerfile/distribtest/python_centos6_x64/Dockerfile b/tools/dockerfile/distribtest/python_centos6_x64/Dockerfile
index 99306bb403..79dae0742f 100644
--- a/tools/dockerfile/distribtest/python_centos6_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/python_centos6_x64/Dockerfile
@@ -29,10 +29,18 @@
FROM centos:6
-RUN yum install -y python
+RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
-RUN rpm -ivh http://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
-RUN yum install -y python-pip
+# Vanilla CentOS6 only has python 2.6 and we don't support that.
+RUN yum -y install yum -y install https://centos6.iuscommunity.org/ius-release.rpm
+RUN yum install -y python27
-RUN pip install --upgrade pip
+# Override python2.6
+RUN ln -s /usr/bin/python2.7 /usr/local/bin/python
+RUN ln -s /usr/bin/python2.7 /usr/local/bin/python2
+# Install pip
+RUN curl https://bootstrap.pypa.io/get-pip.py | python -
+
+# "which" command required by python's run_distrib_test.sh
+RUN yum install -y which