Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[xDS Proto] Pin PyPI dependencies in Dockerfiles (#25510)

Browse Source
reviewable/pr25528/r1
Lidi Zheng 4 years ago committed by GitHub
parent 9d897cb1a5
commit a6c5d6c43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 26 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      templates/tools/dockerfile/gcp_api_libraries.include
  2. 3
      templates/tools/dockerfile/test/sanity/Dockerfile.template
  3. 3
      tools/buildgen/generate_projects.sh
  4. 2
      tools/dockerfile/grpc_clang_tidy/Dockerfile
  5. 2
      tools/dockerfile/interoptest/grpc_interop_python/Dockerfile
  6. 2
      tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile
  7. 2
      tools/dockerfile/test/csharp_stretch_x64/Dockerfile
  8. 2
      tools/dockerfile/test/cxx_buster_x64/Dockerfile
  9. 2
      tools/dockerfile/test/cxx_jessie_x64/Dockerfile
  10. 2
      tools/dockerfile/test/cxx_jessie_x86/Dockerfile
  11. 2
      tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile
  12. 2
      tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile
  13. 2
      tools/dockerfile/test/node_jessie_x64/Dockerfile
  14. 2
      tools/dockerfile/test/php7_jessie_x64/Dockerfile
  15. 2
      tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile
  16. 2
      tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile
  17. 2
      tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
  18. 2
      tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile
  19. 2
      tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile
  20. 2
      tools/dockerfile/test/python_stretch_default_x64/Dockerfile
  21. 2
      tools/dockerfile/test/ruby_buster_x64/Dockerfile
  22. 5
      tools/dockerfile/test/sanity/Dockerfile

2
templates/tools/dockerfile/gcp_api_libraries.include
Unescape View File

@ -1,2 +1,2 @@
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0

3
templates/tools/dockerfile/test/sanity/Dockerfile.template
Unescape View File

@ -33,6 +33,9 @@
RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml
RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml six
# Upgrade Python's YAML library
RUN python3 -m pip install --upgrade --ignore-installed PyYAML==5.4.1 --user
# Add buster-backports for more recent clang packages
RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list

3
tools/buildgen/generate_projects.sh
Unescape View File

@ -18,9 +18,6 @@ set -e
export TEST=${TEST:-false}
# Upgrade Python's YAML library
python3 -m pip install --upgrade --ignore-installed PyYAML --user
echo "Generating build_autogenerated.yaml from bazel BUILD file"
rm -f build_autogenerated.yaml
python3 tools/buildgen/extract_metadata_from_bazel_xml.py

2
tools/dockerfile/grpc_clang_tidy/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
RUN mkdir /var/local/jenkins

2
tools/dockerfile/interoptest/grpc_interop_python/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/test/csharp_stretch_x64/Dockerfile
Unescape View File

@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#================
# C# dependencies

2
tools/dockerfile/test/cxx_buster_x64/Dockerfile
Unescape View File

@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#=================
# C++ dependencies

2
tools/dockerfile/test/cxx_jessie_x64/Dockerfile
Unescape View File

@ -67,7 +67,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#=================
# C++ dependencies

2
tools/dockerfile/test/cxx_jessie_x86/Dockerfile
Unescape View File

@ -67,7 +67,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#=================
# C++ dependencies

2
tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile
Unescape View File

@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#=================
# C++ dependencies

2
tools/dockerfile/test/cxx_ubuntu1804_x64/Dockerfile
Unescape View File

@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#=================
# C++ dependencies

2
tools/dockerfile/test/node_jessie_x64/Dockerfile
Unescape View File

@ -78,7 +78,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#==================
# Node dependencies

2
tools/dockerfile/test/php7_jessie_x64/Dockerfile
Unescape View File

@ -78,7 +78,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#=================
# PHP Test dependencies

2
tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/test/python_stretch_3.8_x64/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/test/python_stretch_default_x64/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# 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

2
tools/dockerfile/test/ruby_buster_x64/Dockerfile
Unescape View File

@ -66,7 +66,7 @@ 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.15.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
#==================
# Ruby dependencies

5
tools/dockerfile/test/sanity/Dockerfile
Unescape View File

@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py | python2.7
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client oauth2client
RUN pip install --upgrade google-auth==1.24.0 google-api-python-client==1.12.8 oauth2client==4.1.0
RUN mkdir /var/local/jenkins
@ -81,6 +81,9 @@ RUN apt-get update && apt-get install -y \
RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml
RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml six
# Upgrade Python's YAML library
RUN python3 -m pip install --upgrade --ignore-installed PyYAML==5.4.1 --user
# Add buster-backports for more recent clang packages
RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list

Write Preview
Loading…
Cancel
Save