diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-08 10:23:54 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-08 10:23:54 -0800 |
| commit | 2c073e361e3fdedbab4b5d43b863ca868f98f8c1 (patch) | |
| tree | dd9387a362e56476dc97e2d1513e7e1fa06d2fbb | |
| parent | 4c848c5af0c515a207b5fe62d809385d3ca6276b (diff) | |
| parent | cd7411466e3a434bc14cb3f2d2fc46f1f5754046 (diff) | |
Merge pull request #5110 from jtattermusch/fix_python_jessie_x86
Make python jessie x86 distribtest pass
| -rw-r--r-- | tools/dockerfile/distribtest/python_jessie_x86/Dockerfile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile index cb6ec22d0a..e9cf99142b 100644 --- a/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile +++ b/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile @@ -30,3 +30,8 @@ FROM 32bit/debian:jessie RUN apt-get update && apt-get install -y python python-pip + +# docker is running on a 64-bit machine, so we need to +# override "uname -m" to report i686 instead of x86_64, otherwise +# python will choose a wrong binary package to install. +ENTRYPOINT ["linux32"] |