Merge pull request #5429 from jtattermusch/python_fedora21_distribtest

Fix python distribtest on fedora20 and fedora21.
9 years ago · 0d034da324
parent 2596d8f7e7 0222b92cd0
commit 0d034da324
2 changed files with 10 additions and 0 deletions
--- a/tools/dockerfile/distribtest/python_fedora20_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/python_fedora20_x64/Dockerfile
@ -30,3 +30,8 @@
 FROM fedora:20

 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
--- 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