Add different Dockerfile for each Python version

3 files changed, 62 insertions, 3 deletions

diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
new file mode 100644
index 0000000000..34beaa8a49
--- /dev/null
+++ b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
@@ -0,0 +1,29 @@
+%YAML 1.2
+--- |
+  # Copyright 2018 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  
+  FROM debian:stretch
+  
+  <%include file="../../apt_get_basic.include"/>
+  <%include file="../../gcp_api_libraries.include"/>
+  
+  RUN apt-get update && apt-get install -y python2.7 python3.5 python-all-dev python3-all-dev
+
+  RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
+  RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5
+
+  <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
diff --git a/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
index b897cace1e..cba11a88fd 100644
--- a/templates/tools/dockerfile/test/python_stretch_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
@@ -22,12 +22,10 @@
   # Install Python Versions from Debian 'testing' repository
   RUN echo 'deb http://ftp.de.debian.org/debian testing main' >> /etc/apt/sources.list
   RUN echo 'APT::Default-Release "stable";' | tee -a /etc/apt/apt.conf.d/00local
-  RUN apt-get update && apt-get -t testing install -y python2.7 python3.5 python3.6 python3.7 python-all-dev python3-all-dev
+  RUN apt-get update && apt-get -t testing install -y python2.7 python3.6 python-all-dev python3-all-dev
 
   RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
-  RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5
   RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6
-  RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
 
   <%include file="../../run_tests_addons.include"/>
   # Define the default command.
diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
new file mode 100644
index 0000000000..9ae0ad14bb
--- /dev/null
+++ b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
@@ -0,0 +1,32 @@
+%YAML 1.2
+--- |
+  # Copyright 2018 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  
+  FROM debian:stretch
+  
+  <%include file="../../apt_get_basic.include"/>
+  <%include file="../../gcp_api_libraries.include"/>
+  
+  # Install Python Versions from Debian 'testing' repository
+  RUN echo 'deb http://ftp.de.debian.org/debian testing main' >> /etc/apt/sources.list
+  RUN echo 'APT::Default-Release "stable";' | tee -a /etc/apt/apt.conf.d/00local
+  RUN apt-get update && apt-get -t testing install -y python2.7 python3.7 python-all-dev python3-all-dev
+
+  RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
+  RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
+
+  <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]