diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-07-06 15:34:42 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-07-06 15:34:42 -0700 |
| commit | f2e20c2d8cce4c5b36d2409b19213100b5a81bfb (patch) | |
| tree | 8fe794d6813e68e6fa4baebd838a5d4ce63f0a56 /tools/dockerfile/interoptest/grpc_interop_python | |
| parent | fce332a4c46435537487fb1609b381bb8ea6e585 (diff) | |
| parent | 2a16a028e019408e0670b82488458df20298760e (diff) | |
Merge branch 'master' of github.com:grpc/grpc into bb_reader_error
Diffstat (limited to 'tools/dockerfile/interoptest/grpc_interop_python')
| -rw-r--r-- | tools/dockerfile/interoptest/grpc_interop_python/Dockerfile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile index 071fb2c93b..8e7319c200 100644 --- a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile @@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \ # Install Python packages from PyPI RUN pip install pip --upgrade RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc @@ -86,10 +86,6 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/c++ RUN ln -s /usr/bin/ccache /usr/local/bin/clang RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ -#====================== -# Zookeeper dependencies -# TODO(jtattermusch): is zookeeper still needed? -RUN apt-get install -y libzookeeper-mt-dev RUN mkdir /var/local/jenkins |