From a62344e56ab43a0fa9fd382e7e465751261b4a39 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 23 Oct 2018 20:01:17 -0700 Subject: Rename the Dockerfiles --- .../test/python_stretch_2.7_x64/Dockerfile.template | 17 +++++++++++++++++ .../test/python_stretch_27_x64/Dockerfile.template | 17 ----------------- .../test/python_stretch_3.5_x64/Dockerfile.template | 20 ++++++++++++++++++++ .../test/python_stretch_3.6_x64/Dockerfile.template | 20 ++++++++++++++++++++ .../test/python_stretch_3.7_x64/Dockerfile.template | 20 ++++++++++++++++++++ .../test/python_stretch_35_x64/Dockerfile.template | 20 -------------------- .../test/python_stretch_36_x64/Dockerfile.template | 20 -------------------- .../test/python_stretch_37_x64/Dockerfile.template | 20 -------------------- 8 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template delete mode 100644 templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template (limited to 'templates') diff --git a/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template new file mode 100644 index 0000000000..a1c9d9f84d --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template @@ -0,0 +1,17 @@ +%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. + + <%include file="../../python_stretch.include"/> diff --git a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template deleted file mode 100644 index a1c9d9f84d..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template +++ /dev/null @@ -1,17 +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. - - <%include file="../../python_stretch.include"/> diff --git a/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template new file mode 100644 index 0000000000..93b655ea0d --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template @@ -0,0 +1,20 @@ +%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. + + <%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 diff --git a/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template new file mode 100644 index 0000000000..a5dcf196f2 --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template @@ -0,0 +1,20 @@ +%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. + + <%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 diff --git a/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template new file mode 100644 index 0000000000..ff342db493 --- /dev/null +++ b/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template @@ -0,0 +1,20 @@ +%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. + + <%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 diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template deleted file mode 100644 index 93b655ea0d..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template +++ /dev/null @@ -1,20 +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. - - <%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 diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template deleted file mode 100644 index a5dcf196f2..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template +++ /dev/null @@ -1,20 +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. - - <%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 diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template deleted file mode 100644 index ff342db493..0000000000 --- a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template +++ /dev/null @@ -1,20 +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. - - <%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 -- cgit v1.2.3