diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-11 08:51:16 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-11 08:51:16 -0800 |
| commit | c0473cc8235ab94f38a9d9891e2352e76960fb96 (patch) | |
| tree | 1b7cdda11382438addf82bca4a1017bdf1da25f8 /tools/dockerfile/distribtest/python_jessie_x86/Dockerfile | |
| parent | cce7fe06262a1b38f4f74e127fc7dc6047763437 (diff) | |
| parent | f79366a3c99592eccd9c719c86dca2f976804d3d (diff) | |
Merge github.com:grpc/grpc into compress
Diffstat (limited to 'tools/dockerfile/distribtest/python_jessie_x86/Dockerfile')
| -rw-r--r-- | tools/dockerfile/distribtest/python_jessie_x86/Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile index 035d56b655..e9cf99142b 100644 --- a/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile +++ b/tools/dockerfile/distribtest/python_jessie_x86/Dockerfile @@ -29,6 +29,9 @@ FROM 32bit/debian:jessie -RUN apt-get update -RUN apt-get install -y git python python-pip +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"] |