aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Lidi Zheng <lidiz@google.com>2018-10-23 13:29:24 -0700
committerGravatar Lidi Zheng <lidiz@google.com>2018-10-23 13:29:24 -0700
commita8658d919284ed8fac992e7682c0bf9ffb951abe (patch)
tree367b5f65215a7beceab66fa22ac02029a08869ef /templates
parent772c4c43362736690779eb8d52279a97b5335b6d (diff)
Put `jessie` back for Python3.4
* According to `https://packages.debian.org/jessie/python/python3.4` the Python3.4 has security issues. * Debian `stretch` doesn't include Python3.4 packages in their repo
Diffstat (limited to 'templates')
-rw-r--r--templates/tools/dockerfile/apt_get_python_27.include2
-rw-r--r--templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template28
2 files changed, 29 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/apt_get_python_27.include b/templates/tools/dockerfile/apt_get_python_27.include
index c7642d8c79..4ee37ef11f 100644
--- a/templates/tools/dockerfile/apt_get_python_27.include
+++ b/templates/tools/dockerfile/apt_get_python_27.include
@@ -1,3 +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
+RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
diff --git a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
new file mode 100644
index 0000000000..e73b839a28
--- /dev/null
+++ b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
@@ -0,0 +1,28 @@
+%YAML 1.2
+--- |
+ # Copyright 2015 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:jessie
+
+ <%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
+ 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.
+ CMD ["bash"]