diff options
Diffstat (limited to 'tools/dockerfile/distribtest/python_fedora21_x64')
| -rw-r--r-- | tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile b/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile index e35de109ea..fcbe053f1f 100644 --- a/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile +++ b/tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2015-2016, Google Inc. +# Copyright 2015, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -29,9 +29,14 @@ FROM fedora:21 -RUN yum clean all -RUN yum update -y -RUN yum install -y git -RUN yum install -y python -RUN yum install -y python-pip +# Make yum work properly under docker when using overlay storage driver. +# https://bugzilla.redhat.com/show_bug.cgi?id=1213602#c9 +# https://github.com/docker/docker/issues/10180 +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 |