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
pull/16945/head
Lidi Zheng 6 years ago
parent 772c4c4336
commit a8658d9192
  1. 2
      templates/tools/dockerfile/apt_get_python_27.include
  2. 28
      templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
  3. 79
      tools/dockerfile/test/python_jessie_x64/Dockerfile
  4. 1
      tools/dockerfile/test/python_stretch_27_x64/Dockerfile
  5. 1
      tools/dockerfile/test/python_stretch_34_x64/Dockerfile
  6. 1
      tools/dockerfile/test/python_stretch_35_x64/Dockerfile
  7. 1
      tools/dockerfile/test/python_stretch_36_x64/Dockerfile
  8. 1
      tools/dockerfile/test/python_stretch_37_x64/Dockerfile
  9. 5
      tools/run_tests/run_tests.py

@ -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
RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7

@ -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"]

@ -0,0 +1,79 @@
# 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
# Install Git and basic packages.
RUN apt-get update && apt-get install -y \
autoconf \
autotools-dev \
build-essential \
bzip2 \
ccache \
curl \
dnsutils \
gcc \
gcc-multilib \
git \
golang \
gyp \
lcov \
libc6 \
libc6-dbg \
libc6-dev \
libgtest-dev \
libtool \
make \
perl \
strace \
python-dev \
python-setuptools \
python-yaml \
telnet \
unzip \
wget \
zip && apt-get clean
#================
# 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
# Install dependencies
RUN apt-get update && apt-get install -y \
python-all-dev \
python3-all-dev \
python-pip
# Install Python packages from PyPI
RUN pip install --upgrade pip==10.0.1
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0
# 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
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]

@ -57,6 +57,7 @@ RUN pip install --upgrade google-api-python-client oauth2client
RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
RUN mkdir /var/local/jenkins
# Define the default command.

@ -57,6 +57,7 @@ RUN pip install --upgrade google-api-python-client oauth2client
RUN apt-get update && apt-get install -y python2.7 python-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
RUN apt-get update && apt-get install -y python3.4 python3-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4

@ -57,6 +57,7 @@ RUN pip install --upgrade google-api-python-client oauth2client
RUN apt-get update && apt-get install -y python2.7 python-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

@ -56,6 +56,7 @@ 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
# 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

@ -56,6 +56,7 @@ 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
# 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

@ -760,14 +760,13 @@ class PythonLanguage(object):
def python_manager_name(self):
if self.args.compiler in [
'python2.7', 'python3.4', 'python3.5', 'python3.6', 'python3.7'
'python2.7', 'python3.5', 'python3.6', 'python3.7'
]:
return 'stretch_%s' % re.sub(r'\D*', '', self.args.compiler)
elif self.args.compiler == 'python_alpine':
return 'alpine'
else:
raise ValueError("No Docker Python manager available for %s" %
self.args.compiler)
return 'jessie'
def _get_pythons(self, args):
if args.arch == 'x86':

Loading…
Cancel
Save