Pack templates into a concentrated one

pull/16945/head
Lidi Zheng 6 years ago
parent b18abf21d6
commit a82ba64943
  1. 9
      templates/tools/dockerfile/python_stretch.include
  2. 11
      templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template
  3. 28
      templates/tools/dockerfile/test/python_stretch_34_x64/Dockerfile.template
  4. 14
      templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
  5. 13
      templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
  6. 13
      templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
  7. 7
      tools/dockerfile/test/python_stretch_27_x64/Dockerfile
  8. 68
      tools/dockerfile/test/python_stretch_34_x64/Dockerfile
  9. 12
      tools/dockerfile/test/python_stretch_35_x64/Dockerfile
  10. 10
      tools/dockerfile/test/python_stretch_36_x64/Dockerfile
  11. 10
      tools/dockerfile/test/python_stretch_37_x64/Dockerfile

@ -0,0 +1,9 @@
FROM debian:stretch
<%include file="./apt_get_basic.include"/>
<%include file="./gcp_api_libraries.include"/>
<%include file="./apt_get_python_27.include"/>
<%include file="./debian_testing_repo.include"/>
<%include file="./run_tests_addons.include"/>
# Define the default command.
CMD ["bash"]

@ -13,12 +13,5 @@
# 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"/>
<%include file="../../apt_get_python_27.include"/>
<%include file="../../run_tests_addons.include"/>
# Define the default command.
CMD ["bash"]
<%include file="../../python_stretch.include"/>

@ -1,28 +0,0 @@
%YAML 1.2
--- |
# 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.
# 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"/>
<%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
<%include file="../../run_tests_addons.include"/>
# Define the default command.
CMD ["bash"]

@ -13,16 +13,8 @@
# 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"/>
<%include file="../../apt_get_python_27.include"/>
<%include file="../../python_stretch.include"/>
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"/>
# Define the default command.
CMD ["bash"]

@ -13,17 +13,8 @@
# 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"/>
<%include file="../../apt_get_python_27.include"/>
<%include file="../../debian_testing_repo.include"/>
<%include file="../../python_stretch.include"/>
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"/>
# Define the default command.
CMD ["bash"]

@ -13,17 +13,8 @@
# 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"/>
<%include file="../../apt_get_python_27.include"/>
<%include file="../../debian_testing_repo.include"/>
<%include file="../../python_stretch.include"/>
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"/>
# Define the default command.
CMD ["bash"]

@ -13,7 +13,7 @@
# limitations under the License.
FROM debian:stretch
# Install Git and basic packages.
RUN apt-get update && apt-get install -y \
autoconf \
@ -57,8 +57,13 @@ 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
# 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
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]

@ -1,68 +0,0 @@
# 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.
# 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
# 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
# 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 apt-get update && apt-get install -y python3.4 python3-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]

@ -13,7 +13,7 @@
# limitations under the License.
FROM debian:stretch
# Install Git and basic packages.
RUN apt-get update && apt-get install -y \
autoconf \
@ -57,12 +57,16 @@ 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
# 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
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]
RUN apt-get update && apt-get install -y python3.5 python3-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5

@ -13,7 +13,7 @@
# limitations under the License.
FROM debian:stretch
# Install Git and basic packages.
RUN apt-get update && apt-get install -y \
autoconf \
@ -62,11 +62,11 @@ RUN echo 'deb http://ftp.de.debian.org/debian testing main' >> /etc/apt/sources.
RUN echo 'APT::Default-Release "stable";' | tee -a /etc/apt/apt.conf.d/00local
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
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]
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

@ -13,7 +13,7 @@
# limitations under the License.
FROM debian:stretch
# Install Git and basic packages.
RUN apt-get update && apt-get install -y \
autoconf \
@ -62,11 +62,11 @@ RUN echo 'deb http://ftp.de.debian.org/debian testing main' >> /etc/apt/sources.
RUN echo 'APT::Default-Release "stable";' | tee -a /etc/apt/apt.conf.d/00local
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
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]
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

Loading…
Cancel
Save