aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/distribtest
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-25 18:19:23 -0800
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-25 18:19:51 -0800
commite5e665564e6080aa81161d059fbe5f1fb862bbce (patch)
treed30f821256a9897bae5b197bc1e57d63c568eb4a /tools/dockerfile/distribtest
parent2596d8f7e786b22be2fba95c8ced4ec0ad017739 (diff)
fix python distribtest on fedora21
Diffstat (limited to 'tools/dockerfile/distribtest')
-rw-r--r--tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile b/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile
index 1eb4c1e775..f1b0e2f4b2 100644
--- a/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile
@@ -35,3 +35,8 @@ FROM fedora:21
RUN yum install -y yum-plugin-ovl
RUN yum clean all && yum update -y && yum install -y python python-pip
+
+# Upgrading six would fail because of docker issue when using overlay.
+# Trying twice makes it work fine.
+# https://github.com/docker/docker/issues/10180
+RUN pip2 install --upgrade six || pip2 install --upgrade six