From bfe2d8153df127508a8105361fbf1d4623dc1657 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 19 Oct 2018 11:59:28 -0700 Subject: Using template to generate Dockerfile --- .../test/python_testing_x64/Dockerfile.template | 34 ++++++++++++++++++++++ .../dockerfile/test/python_testing_x64/Dockerfile | 18 ++---------- 2 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template diff --git a/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template new file mode 100644 index 0000000000..563edd38a6 --- /dev/null +++ b/templates/tools/dockerfile/test/python_testing_x64/Dockerfile.template @@ -0,0 +1,34 @@ +%YAML 1.2 +--- | + # Copyright 2016 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 Debain '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 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. + CMD ["bash"] diff --git a/tools/dockerfile/test/python_testing_x64/Dockerfile b/tools/dockerfile/test/python_testing_x64/Dockerfile index 0b3c5e55d8..788212b836 100644 --- a/tools/dockerfile/test/python_testing_x64/Dockerfile +++ b/tools/dockerfile/test/python_testing_x64/Dockerfile @@ -53,32 +53,18 @@ RUN apt-get update && apt-get install -y time && apt-get clean 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 Python 3 +# Install Python Versions from Debain '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 -t testing install -y python3-distutils 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 + RUN mkdir /var/local/jenkins # Define the default command. -- cgit v1.2.3