diff options
author | Matt Kwong <mattkwong@google.com> | 2018-05-08 14:16:44 -0700 |
---|---|---|
committer | Matt Kwong <mattkwong@google.com> | 2018-05-08 14:16:44 -0700 |
commit | 4d5200f99a2824ff91357328d88395f76f6649f2 (patch) | |
tree | ef5c2d6dd9bf4e1a430a419cc697b52c16aad2de /tools/dockerfile | |
parent | 924419f56cb03089568a5b59a95e48505f0148b5 (diff) |
Install pip for Python3.4 in all Dockerfiles used for Python testing
Diffstat (limited to 'tools/dockerfile')
-rw-r--r-- | tools/dockerfile/interoptest/grpc_interop_python/Dockerfile | 4 | ||||
-rw-r--r-- | tools/dockerfile/test/python_pyenv_x64/Dockerfile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile index 97cdf48db8..94290f3620 100644 --- a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile @@ -64,6 +64,10 @@ RUN pip install --upgrade pip==10.0.1 RUN pip install virtualenv RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Install pip and virtualenv for Python 3.4 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 +RUN python3.4 -m pip install virtualenv + # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc RUN ln -s /usr/bin/ccache /usr/local/bin/g++ diff --git a/tools/dockerfile/test/python_pyenv_x64/Dockerfile b/tools/dockerfile/test/python_pyenv_x64/Dockerfile index 24fe7b2931..6d72a1cc40 100644 --- a/tools/dockerfile/test/python_pyenv_x64/Dockerfile +++ b/tools/dockerfile/test/python_pyenv_x64/Dockerfile @@ -91,6 +91,10 @@ RUN pyenv install 3.6-dev RUN pyenv install pypy-5.3.1 RUN pyenv local 3.5-dev 3.6-dev pypy-5.3.1 +# Install pip and virtualenv for Python 3.4 +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 +RUN python3.4 -m pip install virtualenv + # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc RUN ln -s /usr/bin/ccache /usr/local/bin/g++ |