Fix PHP xDS test

pull/23126/head
Stanley Cheung 5 years ago
parent 6b3ca6a48b
commit 8a856d3814
  1. 15
      tools/dockerfile/test/php73_zts_stretch_x64/Dockerfile
  2. 9
      tools/internal_ci/linux/grpc_xds_php_test_in_docker.sh

@ -16,23 +16,15 @@ FROM php:7.3-zts-stretch
RUN apt-get -qq update && apt-get -qq install -y \
autoconf automake build-essential git libtool curl \
zlib1g-dev \
python-all-dev \
python3-all-dev \
python-setuptools
WORKDIR /tmp
RUN git clone https://github.com/grpc/grpc
RUN git clone https://github.com/krakjoe/pthreads
RUN cd grpc && \
git submodule update --init --recursive && \
make && \
make install && \
cd third_party/protobuf && \
make install && \
ldconfig
RUN cd pthreads && \
phpize && \
./configure && \
@ -47,4 +39,7 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
RUN curl -sS https://getcomposer.org/installer | php
RUN mv composer.phar /usr/local/bin/composer
WORKDIR /var/local/git/grpc
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]

@ -46,12 +46,9 @@ touch "$TOOLS_DIR"/src/proto/grpc/testing/__init__.py
"$PROTO_SOURCE_DIR"/messages.proto \
"$PROTO_SOURCE_DIR"/empty.proto
# Compile the PHP extension.
(cd src/php/ext/grpc && \
phpize && \
./configure && \
make && \
make install)
# Generate and compile the PHP extension.
(pear package && \
find . -name grpc-*.tgz | xargs -I{} pecl install {})
# Prepare generated PHP code.
export CC=/usr/bin/gcc

Loading…
Cancel
Save