diff options
author | Alistair Veitch <aveitch@google.com> | 2016-02-11 09:23:20 -0800 |
---|---|---|
committer | Alistair Veitch <aveitch@google.com> | 2016-02-11 09:23:20 -0800 |
commit | 749250f6a00a97b0deb4c92afc25f3f1eab04c14 (patch) | |
tree | 93c15de447ed683f5778e7c2283a802688d3ca0d /tools/dockerfile/distribtest/python_centos6_x64/Dockerfile | |
parent | 532519ac210d59551520c70cb3aa5eb7cc1f1b37 (diff) | |
parent | f79366a3c99592eccd9c719c86dca2f976804d3d (diff) |
merge to HEAD
Diffstat (limited to 'tools/dockerfile/distribtest/python_centos6_x64/Dockerfile')
-rw-r--r-- | tools/dockerfile/distribtest/python_centos6_x64/Dockerfile | 16 |
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 |