Migrate from `jessie` to `stretch`

7 files changed, 24 insertions, 30 deletions

diff --git a/templates/tools/dockerfile/apt_get_python_27.include b/templates/tools/dockerfile/apt_get_python_27.include
new file mode 100644
index 0000000000..c7642d8c79
--- /dev/null
+++ b/templates/tools/dockerfile/apt_get_python_27.include
@@ -0,0 +1,3 @@
+# 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
\ No newline at end of file
diff --git a/templates/tools/dockerfile/debian_testing_repo.include b/templates/tools/dockerfile/debian_testing_repo.include
new file mode 100644
index 0000000000..1a5248e226
--- /dev/null
+++ b/templates/tools/dockerfile/debian_testing_repo.include
@@ -0,0 +1,3 @@
+# Add 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
diff --git a/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template
index 1e013b742c..067d68bc37 100644
--- a/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template
@@ -1,6 +1,6 @@
 %YAML 1.2
 --- |
-  # Copyright 2016 gRPC authors.
+  # Copyright 2018 The gRPC authors
   #
   # Licensed under the Apache License, Version 2.0 (the "License");
   # you may not use this file except in compliance with the License.
@@ -18,12 +18,7 @@
   
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../gcp_api_libraries.include"/>
-  <%include file="../../python_deps.include"/>
-  <%include file="../../apt_get_pyenv.include"/>
-  # Install pip and virtualenv for Python 3.5
-  RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5
-  RUN python3.5 -m pip install virtualenv
-
+  <%include file="../../apt_get_python_27.include"/>
   <%include file="../../run_tests_addons.include"/>
   # Define the default command.
   CMD ["bash"]
diff --git a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template
index e73b839a28..6fe4fc4b67 100644
--- a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template
@@ -1,6 +1,6 @@
 %YAML 1.2
 --- |
-  # Copyright 2015 gRPC authors.
+  # Copyright 2018 The gRPC authors
   #
   # Licensed under the Apache License, Version 2.0 (the "License");
   # you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
-  FROM debian:jessie
+  FROM debian:stretch
   
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../gcp_api_libraries.include"/>
-  <%include file="../../python_deps.include"/>
-  # Install pip and virtualenv for Python 3.4
+  <%include file="../../apt_get_python_27.include"/>
+  
+  RUN apt-get update && apt-get install -y python3.4 python3-all-dev
   RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4
-  RUN python3.4 -m pip install virtualenv
 
   <%include file="../../run_tests_addons.include"/>
   # Define the default command.
diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
index 34beaa8a49..e339bb5ced 100644
--- a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
@@ -1,6 +1,6 @@
 %YAML 1.2
 --- |
-  # Copyright 2018 gRPC authors.
+  # Copyright 2018 The gRPC authors
   #
   # Licensed under the Apache License, Version 2.0 (the "License");
   # you may not use this file except in compliance with the License.
@@ -18,10 +18,9 @@
   
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../gcp_api_libraries.include"/>
+  <%include file="../../apt_get_python_27.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 apt-get update && apt-get install -y python3.5 python3-all-dev
   RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5
 
   <%include file="../../run_tests_addons.include"/>
diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
index cba11a88fd..7db3b7609e 100644
--- a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
@@ -1,6 +1,6 @@
 %YAML 1.2
 --- |
-  # Copyright 2018 gRPC authors.
+  # Copyright 2018 The gRPC authors
   #
   # Licensed under the Apache License, Version 2.0 (the "License");
   # you may not use this file except in compliance with the License.
@@ -18,13 +18,10 @@
   
   <%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.6 python-all-dev python3-all-dev
+  <%include file="../../apt_get_python_27.include"/>
+  <%include file="../../debian_testing_repo.include"/>
 
-  RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
+  RUN apt-get update && apt-get -t testing install -y python3.6 python3-all-dev
   RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6
 
   <%include file="../../run_tests_addons.include"/>
diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
index 9ae0ad14bb..7fb2798029 100644
--- a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
@@ -1,6 +1,6 @@
 %YAML 1.2
 --- |
-  # Copyright 2018 gRPC authors.
+  # Copyright 2018 The gRPC authors
   #
   # Licensed under the Apache License, Version 2.0 (the "License");
   # you may not use this file except in compliance with the License.
@@ -18,13 +18,10 @@
   
   <%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
+  <%include file="../../apt_get_python_27.include"/>
+  <%include file="../../debian_testing_repo.include"/>
 
-  RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
+  RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev
   RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
 
   <%include file="../../run_tests_addons.include"/>