From 7d8f295ab0c0be7452ab6ce07300d7c3129fc5c4 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 13 May 2020 10:59:09 -0700 Subject: [PATCH] Fix run_tests pip install error --- templates/tools/dockerfile/gcp_api_libraries.include | 1 - templates/tools/dockerfile/python_debian10.include | 2 +- templates/tools/dockerfile/python_deps.include | 3 ++- templates/tools/dockerfile/python_stretch.include | 2 +- .../test/csharp_stretch_x64/Dockerfile.template | 2 +- .../dockerfile/test/cxx_buster_x64/Dockerfile.template | 2 +- .../dockerfile/test/cxx_jessie_x64/Dockerfile.template | 2 +- .../dockerfile/test/cxx_jessie_x86/Dockerfile.template | 2 +- .../test/cxx_sanitizers_jessie_x64/Dockerfile.template | 2 +- .../test/cxx_ubuntu1404_x64/Dockerfile.template | 2 +- .../test/cxx_ubuntu1604_x64/Dockerfile.template | 2 +- .../test/cxx_ubuntu1804_x64/Dockerfile.template | 2 +- .../tools/dockerfile/test/fuzzer/Dockerfile.template | 2 +- .../test/node_jessie_x64/Dockerfile.template | 2 +- .../test/php7_jessie_x64/Dockerfile.template | 2 +- .../dockerfile/test/php_jessie_x64/Dockerfile.template | 2 +- .../test/ruby_jessie_x64/Dockerfile.template | 2 +- tools/dockerfile/grpc_clang_tidy/Dockerfile | 3 ++- .../interoptest/grpc_interop_csharp/Dockerfile | 3 ++- .../interoptest/grpc_interop_csharpcoreclr/Dockerfile | 3 ++- .../dockerfile/interoptest/grpc_interop_cxx/Dockerfile | 3 ++- .../dockerfile/interoptest/grpc_interop_go/Dockerfile | 3 ++- .../interoptest/grpc_interop_go1.11/Dockerfile | 3 ++- .../interoptest/grpc_interop_go1.7/Dockerfile | 3 ++- .../interoptest/grpc_interop_go1.8/Dockerfile | 3 ++- .../interoptest/grpc_interop_http2/Dockerfile | 3 ++- .../interoptest/grpc_interop_node/Dockerfile | 3 ++- .../interoptest/grpc_interop_python/Dockerfile | 7 +++---- .../interoptest/grpc_interop_pythonasyncio/Dockerfile | 7 +++---- .../interoptest/grpc_interop_ruby/Dockerfile | 3 ++- tools/dockerfile/test/bazel/Dockerfile | 3 ++- tools/dockerfile/test/csharp_stretch_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/cxx_buster_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/cxx_jessie_x86/Dockerfile | 10 +++++----- .../test/cxx_sanitizers_jessie_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/fuzzer/Dockerfile | 10 +++++----- tools/dockerfile/test/node_jessie_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/php7_jessie_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/php_jessie_x64/Dockerfile | 10 +++++----- .../dockerfile/test/python_stretch_2.7_x64/Dockerfile | 7 +++---- .../dockerfile/test/python_stretch_3.5_x64/Dockerfile | 7 +++---- .../dockerfile/test/python_stretch_3.6_x64/Dockerfile | 7 +++---- .../dockerfile/test/python_stretch_3.7_x64/Dockerfile | 7 +++---- .../dockerfile/test/python_stretch_3.8_x64/Dockerfile | 7 +++---- .../test/python_stretch_default_x64/Dockerfile | 7 +++---- tools/dockerfile/test/ruby_jessie_x64/Dockerfile | 10 +++++----- tools/dockerfile/test/sanity/Dockerfile | 7 +++---- 51 files changed, 133 insertions(+), 130 deletions(-) diff --git a/templates/tools/dockerfile/gcp_api_libraries.include b/templates/tools/dockerfile/gcp_api_libraries.include index 5a263649d2c..f93c24176f7 100644 --- a/templates/tools/dockerfile/gcp_api_libraries.include +++ b/templates/tools/dockerfile/gcp_api_libraries.include @@ -1,3 +1,2 @@ # Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean RUN pip install --upgrade google-api-python-client oauth2client diff --git a/templates/tools/dockerfile/python_debian10.include b/templates/tools/dockerfile/python_debian10.include index 883ece20633..f65c9ff78ac 100644 --- a/templates/tools/dockerfile/python_debian10.include +++ b/templates/tools/dockerfile/python_debian10.include @@ -1,6 +1,6 @@ FROM debian:10 <%include file="./apt_get_basic.include"/> -<%include file="./gcp_api_libraries.include"/> <%include file="./apt_get_python_27.include"/> +<%include file="./gcp_api_libraries.include"/> <%include file="./run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/python_deps.include b/templates/tools/dockerfile/python_deps.include index 8c3f32f0267..cdacfddfed9 100644 --- a/templates/tools/dockerfile/python_deps.include +++ b/templates/tools/dockerfile/python_deps.include @@ -6,9 +6,10 @@ RUN apt-get update && apt-get install -y ${'\\'} python-all-dev ${'\\'} python3-all-dev ${'\\'} - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/templates/tools/dockerfile/python_stretch.include b/templates/tools/dockerfile/python_stretch.include index 8591e753d01..63ea6ae6c65 100644 --- a/templates/tools/dockerfile/python_stretch.include +++ b/templates/tools/dockerfile/python_stretch.include @@ -1,8 +1,8 @@ FROM debian:stretch <%include file="./apt_get_basic.include"/> -<%include file="./gcp_api_libraries.include"/> <%include file="./apt_get_python_27.include"/> +<%include file="./gcp_api_libraries.include"/> # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/templates/tools/dockerfile/test/csharp_stretch_x64/Dockerfile.template b/templates/tools/dockerfile/test/csharp_stretch_x64/Dockerfile.template index 1526d07fc63..355b47e18a0 100644 --- a/templates/tools/dockerfile/test/csharp_stretch_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/csharp_stretch_x64/Dockerfile.template @@ -17,8 +17,8 @@ FROM debian:stretch <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../csharp_deps.include"/> <%include file="../../csharp_dotnetcli_deps.include"/> <%include file="../../run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/test/cxx_buster_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_buster_x64/Dockerfile.template index d3da8ab9410..5d398e4c4db 100644 --- a/templates/tools/dockerfile/test/cxx_buster_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_buster_x64/Dockerfile.template @@ -17,8 +17,8 @@ FROM debian:buster <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template index 9d358a0cf25..1fa7c3b25c7 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template @@ -17,8 +17,8 @@ <%include file="../../debian_jessie_header.include"/> <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../cmake_jessie_backports.include"/> <%include file="../../run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template index fc79ecce190..064b2abae4f 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template @@ -18,8 +18,8 @@ RUN sed -i '/deb http:\/\/http.debian.net\/debian jessie-updates main/d' /etc/apt/sources.list <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> <%include file="../../cmake_jessie_backports.include"/> diff --git a/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template index 7d173236ee3..8d2a40ab023 100644 --- a/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template @@ -19,8 +19,8 @@ RUN sed -i '/deb http:\/\/httpredir.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> #================= # C++ dependencies (purposely excluding Clang because it's part of the base image) RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev && apt-get clean diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template index 3668c97bcdd..3e92dd1a811 100644 --- a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template @@ -17,8 +17,8 @@ FROM ubuntu:14.04 <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> # Define the default command. diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template index a311b12a254..2ab83793d9c 100644 --- a/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template @@ -17,8 +17,8 @@ FROM ubuntu:16.04 <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile.template index 76faebd98d5..dd833b983ef 100644 --- a/templates/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile.template @@ -17,8 +17,8 @@ FROM ubuntu:18.04 <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> diff --git a/templates/tools/dockerfile/test/fuzzer/Dockerfile.template b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template index 345da0804ad..8ad5b06de46 100644 --- a/templates/tools/dockerfile/test/fuzzer/Dockerfile.template +++ b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template @@ -17,8 +17,8 @@ <%include file="../../debian_jessie_header.include"/> <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../cmake_jessie_backports.include"/> <%include file="../../clang_update.include"/> diff --git a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template index cd0513a1a4d..d5c4153c9ec 100644 --- a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template @@ -17,7 +17,6 @@ <%include file="../../debian_jessie_header.include"/> <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> # Install Electron apt dependencies RUN apt-get update && apt-get install -y ${'\\'} @@ -30,6 +29,7 @@ xvfb <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../node_deps.include"/> <%include file="../../run_tests_addons.include"/> # Install Mako to generate files in grpc/grpc-node diff --git a/templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template index d29cd7e4e59..cf83681ecab 100644 --- a/templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template @@ -17,8 +17,8 @@ <%include file="../../debian_jessie_header.include"/> <%include file="../../php7_deps.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../php_valgrind.include"/> <%include file="../../run_tests_addons.include"/> # Define the default command. diff --git a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template index 3bd8f9c7c47..f3459f48ab8 100644 --- a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template @@ -17,8 +17,8 @@ <%include file="../../debian_jessie_header.include"/> <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../php_deps.include"/> <%include file="../../run_tests_addons.include"/> # Define the default command. diff --git a/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template index 2fed02246bb..af90c937f75 100644 --- a/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template @@ -17,8 +17,8 @@ <%include file="../../debian_jessie_header.include"/> <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> + <%include file="../../gcp_api_libraries.include"/> <%include file="../../ruby_deps.include"/> <%include file="../../run_tests_addons.include"/> # Define the default command. diff --git a/tools/dockerfile/grpc_clang_tidy/Dockerfile b/tools/dockerfile/grpc_clang_tidy/Dockerfile index 20e32941164..93c4e6d9257 100644 --- a/tools/dockerfile/grpc_clang_tidy/Dockerfile +++ b/tools/dockerfile/grpc_clang_tidy/Dockerfile @@ -29,9 +29,10 @@ ENV CLANG_TIDY=clang-tidy-6.0 RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile index 917d8a4bf45..39d26d4b01a 100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile @@ -57,9 +57,10 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile index 917d8a4bf45..39d26d4b01a 100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile @@ -57,9 +57,10 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile index d48dfb342d7..477618e5767 100644 --- a/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile @@ -58,9 +58,10 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile index 09b72d03090..78f6a72249b 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile @@ -25,9 +25,10 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile index ee37a0b944b..06787bc7e4b 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go1.11/Dockerfile @@ -25,9 +25,10 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile index 95b8b2342ea..2467c1eeb02 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go1.7/Dockerfile @@ -25,9 +25,10 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile index 09ab216ad21..e8384dd4ff8 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go1.8/Dockerfile @@ -25,9 +25,10 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile index f04dc0851f7..d0232d6b340 100644 --- a/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile @@ -25,9 +25,10 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile index 100799515b7..cc9e2545353 100644 --- a/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile @@ -58,9 +58,10 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile index 3583d783a81..8793d5f336e 100644 --- a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile index 3583d783a81..8793d5f336e 100644 --- a/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile index 4866c7d9abb..b3becf17075 100644 --- a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile @@ -58,9 +58,10 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/test/bazel/Dockerfile b/tools/dockerfile/test/bazel/Dockerfile index 229835a513b..e41f1ab5609 100644 --- a/tools/dockerfile/test/bazel/Dockerfile +++ b/tools/dockerfile/test/bazel/Dockerfile @@ -41,9 +41,10 @@ RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 diff --git a/tools/dockerfile/test/csharp_stretch_x64/Dockerfile b/tools/dockerfile/test/csharp_stretch_x64/Dockerfile index cc6ed85c1c6..684c26f45be 100644 --- a/tools/dockerfile/test/csharp_stretch_x64/Dockerfile +++ b/tools/dockerfile/test/csharp_stretch_x64/Dockerfile @@ -49,10 +49,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -61,13 +57,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================ # C# dependencies diff --git a/tools/dockerfile/test/cxx_buster_x64/Dockerfile b/tools/dockerfile/test/cxx_buster_x64/Dockerfile index f5bacb8bc51..0c4324fe9a2 100644 --- a/tools/dockerfile/test/cxx_buster_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_buster_x64/Dockerfile @@ -49,10 +49,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -61,13 +57,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index 8cb6af124b3..00f51cfe4f9 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -50,10 +50,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -62,13 +58,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index 104b6696150..ce5e074d9a7 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -50,10 +50,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -62,13 +58,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean diff --git a/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile index d05b3508e15..08ed1da1a3d 100644 --- a/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile @@ -51,10 +51,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -63,13 +59,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies (purposely excluding Clang because it's part of the base image) RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev && apt-get clean diff --git a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile index a3659d34e75..08cff8d3b2a 100644 --- a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile @@ -49,10 +49,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -61,13 +57,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean diff --git a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile index 37ed9b85d3c..380bc7ad622 100644 --- a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile @@ -49,10 +49,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -61,13 +57,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean diff --git a/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile index d007738714b..724e41baa5a 100644 --- a/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile @@ -49,10 +49,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -61,13 +57,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean diff --git a/tools/dockerfile/test/fuzzer/Dockerfile b/tools/dockerfile/test/fuzzer/Dockerfile index 9394fc22abf..9f9f247c53c 100644 --- a/tools/dockerfile/test/fuzzer/Dockerfile +++ b/tools/dockerfile/test/fuzzer/Dockerfile @@ -50,10 +50,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -62,13 +58,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index 7cbe7b0f95b..30c278c9267 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -50,10 +50,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Electron apt dependencies RUN apt-get update && apt-get install -y \ @@ -73,13 +69,17 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================== # Node dependencies diff --git a/tools/dockerfile/test/php7_jessie_x64/Dockerfile b/tools/dockerfile/test/php7_jessie_x64/Dockerfile index 55ea982b579..60fec1d47d6 100644 --- a/tools/dockerfile/test/php7_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php7_jessie_x64/Dockerfile @@ -61,10 +61,6 @@ RUN cd /var/local/git/php-src \ && make \ && make install -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -73,13 +69,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # PHP Test dependencies diff --git a/tools/dockerfile/test/php_jessie_x64/Dockerfile b/tools/dockerfile/test/php_jessie_x64/Dockerfile index 94023bb2aba..5a19119d946 100644 --- a/tools/dockerfile/test/php_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php_jessie_x64/Dockerfile @@ -50,10 +50,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -62,13 +58,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================= # PHP dependencies diff --git a/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile index 0bbc11a21b2..876c5dcd4af 100644 --- a/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile index bfedf432b78..5e4ca949a6e 100644 --- a/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile index 3d475849bb9..bc92bd6adcc 100644 --- a/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile index 6745055c14f..00edc458b73 100644 --- a/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile index 8d780f0ad78..3202eb0dcd9 100644 --- a/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/test/python_stretch_default_x64/Dockerfile b/tools/dockerfile/test/python_stretch_default_x64/Dockerfile index 713fd6fe230..9cde17429ec 100644 --- a/tools/dockerfile/test/python_stretch_default_x64/Dockerfile +++ b/tools/dockerfile/test/python_stretch_default_x64/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + # Add Debian 'buster' repository, we will need it for installing newer versions of python RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local diff --git a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile index bfee9441984..12dc3850e57 100644 --- a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile @@ -50,10 +50,6 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - #==================== # Python dependencies @@ -62,13 +58,17 @@ RUN pip install --upgrade google-api-python-client oauth2client RUN apt-get update && apt-get install -y \ python-all-dev \ python3-all-dev \ - python-pip + python-setuptools # Install Python packages from PyPI +RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 RUN pip install --upgrade pip==19.3.1 RUN pip install virtualenv==16.7.9 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + #================== # Ruby dependencies diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 3666b26ef72..c5dd7d6dbdd 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -49,14 +49,13 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - # Install Python 2.7 RUN apt-get update && apt-get install -y python2.7 python-all-dev RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7 +# Google Cloud platform API libraries +RUN pip install --upgrade google-api-python-client oauth2client + RUN mkdir /var/local/jenkins