Upgrade PHP docker images to debian11 (#28701)
* upgrade PHP docker images to debian11 * regenerate dockerfiles * adjust testrunners to php debian11 images
This commit is contained in:
parent
5dfeec7a7e
commit
1289cdae2e
|
|
@ -14,10 +14,12 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM debian:stretch
|
FROM debian:11
|
||||||
|
|
||||||
<%include file="../../apt_get_basic.include"/>
|
<%include file="../../apt_get_basic.include"/>
|
||||||
<%include file="../../run_tests_python_deps.include"/>
|
<%include file="../../run_tests_python_deps.include"/>
|
||||||
<%include file="../../php7_deps.include"/>
|
<%include file="../../php7_deps.include"/>
|
||||||
<%include file="../../run_tests_addons.include"/>
|
|
||||||
<%include file="../../php_common_deps.include"/>
|
<%include file="../../php_common_deps.include"/>
|
||||||
|
<%include file="../../cmake.include"/>
|
||||||
|
<%include file="../../ccache.include"/>
|
||||||
|
<%include file="../../run_tests_addons.include"/>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,8 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM php:7.3-zts-stretch
|
# debian 11 = "bullseye"
|
||||||
|
FROM php:7.3-zts-bullseye
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y ${'\\'}
|
RUN apt-get update && apt-get install -y ${'\\'}
|
||||||
autoconf automake build-essential git libtool curl ${'\\'}
|
autoconf automake build-essential git libtool curl ${'\\'}
|
||||||
|
|
@ -34,8 +35,11 @@
|
||||||
|
|
||||||
<%include file="../../run_tests_python_deps.include"/>
|
<%include file="../../run_tests_python_deps.include"/>
|
||||||
<%include file="../../php_common_deps.include"/>
|
<%include file="../../php_common_deps.include"/>
|
||||||
|
<%include file="../../cmake.include"/>
|
||||||
|
<%include file="../../ccache.include"/>
|
||||||
<%include file="../../run_tests_addons.include"/>
|
<%include file="../../run_tests_addons.include"/>
|
||||||
|
|
||||||
|
# Seems required by XDS interop tests.
|
||||||
RUN python3 -m pip install virtualenv==16.7.9
|
RUN python3 -m pip install virtualenv==16.7.9
|
||||||
|
|
||||||
# Define the default command.
|
# Define the default command.
|
||||||
|
|
@ -14,12 +14,14 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM debian:stretch
|
FROM debian:11
|
||||||
|
|
||||||
<%include file="../../apt_get_basic.include"/>
|
<%include file="../../apt_get_basic.include"/>
|
||||||
<%include file="../../run_tests_python_deps.include"/>
|
<%include file="../../run_tests_python_deps.include"/>
|
||||||
<%include file="../../php7_deps.include"/>
|
<%include file="../../php7_deps.include"/>
|
||||||
<%include file="../../php_valgrind.include"/>
|
<%include file="../../php_valgrind.include"/>
|
||||||
|
<%include file="../../cmake.include"/>
|
||||||
|
<%include file="../../ccache.include"/>
|
||||||
<%include file="../../run_tests_addons.include"/>
|
<%include file="../../run_tests_addons.include"/>
|
||||||
# Define the default command.
|
# Define the default command.
|
||||||
CMD ["bash"]
|
CMD ["bash"]
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM debian:stretch
|
FROM debian:11
|
||||||
|
|
||||||
#=================
|
#=================
|
||||||
# Basic C core dependencies
|
# Basic C core dependencies
|
||||||
|
|
@ -107,10 +107,30 @@ RUN cd /var/local/git/php-src \
|
||||||
&& make -j$(nproc) \
|
&& make -j$(nproc) \
|
||||||
&& make install
|
&& make install
|
||||||
|
|
||||||
|
|
||||||
RUN mkdir /var/local/jenkins
|
|
||||||
|
|
||||||
# Install composer
|
# Install composer
|
||||||
RUN curl -sS https://getcomposer.org/installer | php
|
RUN curl -sS https://getcomposer.org/installer | php
|
||||||
RUN mv composer.phar /usr/local/bin/composer
|
RUN mv composer.phar /usr/local/bin/composer
|
||||||
|
|
||||||
|
#=================
|
||||||
|
# Install cmake
|
||||||
|
# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement.
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y cmake && apt-get clean
|
||||||
|
|
||||||
|
#=================
|
||||||
|
# Install ccache
|
||||||
|
|
||||||
|
# Install ccache from source since ccache 3.x packaged with most linux distributions
|
||||||
|
# does not support Redis backend for caching.
|
||||||
|
RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
|
||||||
|
&& tar -zxf ccache.tar.gz \
|
||||||
|
&& cd ccache-4.5.1 \
|
||||||
|
&& mkdir build && cd build \
|
||||||
|
&& cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
|
||||||
|
&& make -j4 && make install \
|
||||||
|
&& cd ../.. \
|
||||||
|
&& rm -rf ccache-4.5.1 ccache.tar.gz
|
||||||
|
|
||||||
|
|
||||||
|
RUN mkdir /var/local/jenkins
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,8 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM php:7.3-zts-stretch
|
# debian 11 = "bullseye"
|
||||||
|
FROM php:7.3-zts-bullseye
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
autoconf automake build-essential git libtool curl \
|
autoconf automake build-essential git libtool curl \
|
||||||
|
|
@ -59,10 +60,31 @@ RUN python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-clien
|
||||||
RUN curl -sS https://getcomposer.org/installer | php
|
RUN curl -sS https://getcomposer.org/installer | php
|
||||||
RUN mv composer.phar /usr/local/bin/composer
|
RUN mv composer.phar /usr/local/bin/composer
|
||||||
|
|
||||||
|
#=================
|
||||||
|
# Install cmake
|
||||||
|
# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement.
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y cmake && apt-get clean
|
||||||
|
|
||||||
|
#=================
|
||||||
|
# Install ccache
|
||||||
|
|
||||||
|
# Install ccache from source since ccache 3.x packaged with most linux distributions
|
||||||
|
# does not support Redis backend for caching.
|
||||||
|
RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
|
||||||
|
&& tar -zxf ccache.tar.gz \
|
||||||
|
&& cd ccache-4.5.1 \
|
||||||
|
&& mkdir build && cd build \
|
||||||
|
&& cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
|
||||||
|
&& make -j4 && make install \
|
||||||
|
&& cd ../.. \
|
||||||
|
&& rm -rf ccache-4.5.1 ccache.tar.gz
|
||||||
|
|
||||||
|
|
||||||
RUN mkdir /var/local/jenkins
|
RUN mkdir /var/local/jenkins
|
||||||
|
|
||||||
|
|
||||||
|
# Seems required by XDS interop tests.
|
||||||
RUN python3 -m pip install virtualenv==16.7.9
|
RUN python3 -m pip install virtualenv==16.7.9
|
||||||
|
|
||||||
# Define the default command.
|
# Define the default command.
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM debian:stretch
|
FROM debian:11
|
||||||
|
|
||||||
#=================
|
#=================
|
||||||
# Basic C core dependencies
|
# Basic C core dependencies
|
||||||
|
|
@ -112,6 +112,26 @@ RUN cd /var/local/git/php-src \
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
valgrind
|
valgrind
|
||||||
|
#=================
|
||||||
|
# Install cmake
|
||||||
|
# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement.
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y cmake && apt-get clean
|
||||||
|
|
||||||
|
#=================
|
||||||
|
# Install ccache
|
||||||
|
|
||||||
|
# Install ccache from source since ccache 3.x packaged with most linux distributions
|
||||||
|
# does not support Redis backend for caching.
|
||||||
|
RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
|
||||||
|
&& tar -zxf ccache.tar.gz \
|
||||||
|
&& cd ccache-4.5.1 \
|
||||||
|
&& mkdir build && cd build \
|
||||||
|
&& cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
|
||||||
|
&& make -j4 && make install \
|
||||||
|
&& cd ../.. \
|
||||||
|
&& rm -rf ccache-4.5.1 ccache.tar.gz
|
||||||
|
|
||||||
|
|
||||||
RUN mkdir /var/local/jenkins
|
RUN mkdir /var/local/jenkins
|
||||||
|
|
||||||
|
|
@ -20,7 +20,7 @@ cd $(dirname $0)/../../..
|
||||||
|
|
||||||
source tools/internal_ci/helper_scripts/prepare_build_linux_rc
|
source tools/internal_ci/helper_scripts/prepare_build_linux_rc
|
||||||
|
|
||||||
export DOCKERFILE_DIR=tools/dockerfile/test/php73_zts_stretch_x64
|
export DOCKERFILE_DIR=tools/dockerfile/test/php73_zts_debian11_x64
|
||||||
export DOCKER_RUN_SCRIPT=tools/internal_ci/linux/grpc_xds_php_test_in_docker.sh
|
export DOCKER_RUN_SCRIPT=tools/internal_ci/linux/grpc_xds_php_test_in_docker.sh
|
||||||
export OUTPUT_DIR=reports
|
export OUTPUT_DIR=reports
|
||||||
exec tools/run_tests/dockerize/build_and_run_docker.sh
|
exec tools/run_tests/dockerize/build_and_run_docker.sh
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ cd $(dirname $0)/../../..
|
||||||
|
|
||||||
source tools/internal_ci/helper_scripts/prepare_build_linux_rc
|
source tools/internal_ci/helper_scripts/prepare_build_linux_rc
|
||||||
|
|
||||||
export DOCKERFILE_DIR=tools/dockerfile/test/php73_zts_stretch_x64
|
export DOCKERFILE_DIR=tools/dockerfile/test/php73_zts_debian11_x64
|
||||||
export DOCKER_RUN_SCRIPT=tools/internal_ci/linux/grpc_xds_v3_php_test_in_docker.sh
|
export DOCKER_RUN_SCRIPT=tools/internal_ci/linux/grpc_xds_v3_php_test_in_docker.sh
|
||||||
export OUTPUT_DIR=reports
|
export OUTPUT_DIR=reports
|
||||||
exec tools/run_tests/dockerize/build_and_run_docker.sh
|
exec tools/run_tests/dockerize/build_and_run_docker.sh
|
||||||
|
|
|
||||||
|
|
@ -315,7 +315,7 @@ class PHPArtifact:
|
||||||
if self.platform == 'linux':
|
if self.platform == 'linux':
|
||||||
return create_docker_jobspec(
|
return create_docker_jobspec(
|
||||||
self.name,
|
self.name,
|
||||||
'tools/dockerfile/test/php73_zts_stretch_{}'.format(self.arch),
|
'tools/dockerfile/test/php73_zts_debian11_{}'.format(self.arch),
|
||||||
'tools/run_tests/artifacts/build_artifact_php.sh')
|
'tools/run_tests/artifacts/build_artifact_php.sh')
|
||||||
else:
|
else:
|
||||||
return create_jobspec(
|
return create_jobspec(
|
||||||
|
|
|
||||||
|
|
@ -588,7 +588,7 @@ class Php7Language(object):
|
||||||
return 'Makefile'
|
return 'Makefile'
|
||||||
|
|
||||||
def dockerfile_dir(self):
|
def dockerfile_dir(self):
|
||||||
return 'tools/dockerfile/test/php7_stretch_%s' % _docker_arch_suffix(
|
return 'tools/dockerfile/test/php7_debian11_%s' % _docker_arch_suffix(
|
||||||
self.args.arch)
|
self.args.arch)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue