Skip to content
Snippets Groups Projects
Commit 0d034da3 authored by Nathaniel Manista's avatar Nathaniel Manista
Browse files

Merge pull request #5429 from jtattermusch/python_fedora21_distribtest

Fix python distribtest on fedora20 and fedora21.
parents 2596d8f7 0222b92c
No related branches found
No related tags found
No related merge requests found
...@@ -30,3 +30,8 @@ ...@@ -30,3 +30,8 @@
FROM fedora:20 FROM fedora:20
RUN yum clean all && yum update -y && yum install -y python python-pip 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
...@@ -35,3 +35,8 @@ FROM fedora:21 ...@@ -35,3 +35,8 @@ FROM fedora:21
RUN yum install -y yum-plugin-ovl RUN yum install -y yum-plugin-ovl
RUN yum clean all && yum update -y && yum install -y python python-pip 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment