del several docker related files

5 years ago · 840e67984a
parent 32e4c1c1df
commit 840e67984a
10 changed files with 3 additions and 292 deletions
--- a/src/php/README.md
+++ b/src/php/README.md
@ -11,8 +11,7 @@ gRPC PHP installation instructions for Google Cloud Platform is in

 ### Prerequisites

-* `php`: version 7.0 or above (PHP 5.x support will be deprecated some time
-in 2020).
+* `php`: version 7.0 or above (PHP 5.x support is deprecated from Sep 2020).
 * `pecl`
 * `composer`
 * `phpunit` (optional)
--- a/src/php/bin/build_all_docker_images.sh
+++ b/src/php/bin/build_all_docker_images.sh
@ -16,7 +16,7 @@
 set -e
 cd $(dirname $0)/../../..

-ALL_IMAGES=( grpc-ext grpc-src alpine centos7 php5 php-src php-future php-zts
+ALL_IMAGES=( grpc-ext grpc-src alpine centos7 php-src php-future php-zts
             fork-support i386 )

 if [[ "$1" == "--cmds" ]]; then
--- a/src/php/bin/run_all_docker_images.sh
+++ b/src/php/bin/run_all_docker_images.sh
@ -16,7 +16,7 @@
 set -e
 cd $(dirname $0)/../../..

-ALL_IMAGES=( grpc-ext grpc-src alpine centos7 php5 php-src php-future php-zts
+ALL_IMAGES=( grpc-ext grpc-src alpine centos7 php-src php-future php-zts
             fork-support i386 )

 if [[ "$1" == "--cmds" ]]; then
--- a/src/php/docker/README.md
+++ b/src/php/docker/README.md
@ -160,24 +160,10 @@ Run image:
 ```sh
 $ docker run -it --rm grpc-php/php-future
 ```
-
 ### `php5`

-This image builds the `grpc` extension against a PHP 5 base image with ZTS
-enabled.
-
 NOTE: PHP 5.x has reached the end-of-life state and is no longer supported.

-Build `php5` docker image:
-```sh
-$ cd grpc
-$ docker build -t grpc-php/php5 -f ./src/php/docker/php5/Dockerfile .
-```
-
-Run image:
-```sh
-$ docker run -it --rm grpc-php/php5
-```

 ### `fork-support`

--- a/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template
@ -1,23 +0,0 @@
-%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.
-  
-  <%include file="../../debian_jessie_header.include"/>
-  
-  <%include file="../../apt_get_basic.include"/>
-  <%include file="../../php_deps.include"/>
-  <%include file="../../run_tests_addons.include"/>
-  <%include file="../../php_common_deps.include"/>
-  
--- a/templates/tools/dockerfile/php_deps.include
+++ b/templates/tools/dockerfile/php_deps.include
@ -1,11 +0,0 @@
-#=================
-# PHP dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y ${'\\'}
-    git php5 php5-dev unzip
-
-RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && ${'\\'}
-  mv phpunit-5.7.27.phar /usr/local/bin/phpunit && ${'\\'}
-  chmod +x /usr/local/bin/phpunit
--- a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
@ -1,25 +0,0 @@
-%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.
-  
-  <%include file="../../debian_jessie_header.include"/>
-  
-  <%include file="../../apt_get_basic.include"/>
-  <%include file="../../python_deps.include"/>
-  <%include file="../../gcp_api_libraries.include"/>
-  <%include file="../../php_deps.include"/>
-  <%include file="../../run_tests_addons.include"/>
-  # Define the default command.
-  CMD ["bash"]
--- a/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile
@ -1,74 +0,0 @@
-# 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: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
-
-#=================
-# PHP dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y \
-    git php5 php5-dev unzip
-
-RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
-  mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \
-  chmod +x /usr/local/bin/phpunit
-
-
-RUN mkdir /var/local/jenkins
-
-# Install composer
-RUN curl -sS https://getcomposer.org/installer | php
-RUN mv composer.phar /usr/local/bin/composer
-
-# Define the default command.
-CMD ["bash"]
-
--- a/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
@ -1,53 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# Builds PHP interop server and client in a base image.
-set -ex
-
-mkdir -p /var/local/git
-git clone /var/local/jenkins/grpc /var/local/git/grpc
-# clone gRPC submodules, use data from locally cloned submodules where possible
-(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
-&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
-${name}')
-
-# copy service account keys if available
-cp -r /var/local/jenkins/service_account $HOME || true
-
-cd /var/local/git/grpc
-grpc_root="$(pwd)"
-
-# Install gRPC C core
-make -j4 shared_c static_c
-
-# Build gRPC PHP native extension
-pushd src/php/ext/grpc
-phpize
-GRPC_LIB_SUBDIR=libs/opt ./configure --enable-grpc="${grpc_root}"
-make -j4
-popd
-
-cd src/php
-
-DONE=0
-for ((i = 0; i < 5; i++)); do
-  php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install && DONE=1 && break
-done
-
-if [ "$DONE" != "1" ]
-then
-  echo "Failed to do composer install"
-  exit 1
-fi
--- a/tools/dockerfile/test/php_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/php_jessie_x64/Dockerfile
@ -1,88 +0,0 @@
-# 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
-
-#====================
-# Python dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y \
-    python-all-dev \
-    python3-all-dev \
-    python-setuptools
-
-# Install Python packages from PyPI
-RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
-RUN pip install --upgrade pip==19.3.1
-RUN pip install virtualenv==16.7.9
-RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0
-
-# Google Cloud platform API libraries
-RUN pip install --upgrade google-api-python-client oauth2client
-
-#=================
-# PHP dependencies
-
-# Install dependencies
-
-RUN apt-get update && apt-get install -y \
-    git php5 php5-dev unzip
-
-RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
-  mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \
-  chmod +x /usr/local/bin/phpunit
-
-
-RUN mkdir /var/local/jenkins
-
-# Define the default command.
-CMD ["bash"]