diff --git a/kokoro/linux/dockerfile/test/php/Dockerfile b/kokoro/linux/dockerfile/test/php/Dockerfile index 276cb73a4123..a540177c06c3 100644 --- a/kokoro/linux/dockerfile/test/php/Dockerfile +++ b/kokoro/linux/dockerfile/test/php/Dockerfile @@ -20,6 +20,9 @@ RUN apt-get update && apt-get install -y \ parallel \ time \ wget \ + re2c \ + sqlite3 \ + libsqlite3-dev \ && apt-get clean # Install php dependencies @@ -232,6 +235,48 @@ RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.phar \ && cp phpunit /usr/local/php-7.3/bin \ && mv phpunit /usr/local/php-7.3-zts/bin +# php 7.4 +RUN wget https://ftp.gnu.org/gnu/bison/bison-3.0.1.tar.gz -O /var/local/bison-3.0.1.tar.gz +RUN cd /var/local \ + && tar -zxvf bison-3.0.1.tar.gz \ + && cd /var/local/bison-3.0.1 \ + && ./configure \ + && make \ + && make install + +RUN wget https://github.com/php/php-src/archive/php-7.4.0.tar.gz -O /var/local/php-7.4.0.tar.gz + +RUN cd /var/local \ + && tar -zxvf php-7.4.0.tar.gz + +RUN cd /var/local/php-src-php-7.4.0 \ + && ./buildconf --force \ + && ./configure \ + --enable-bcmath \ + --with-gmp \ + --with-openssl \ + --with-zlib \ + --prefix=/usr/local/php-7.4 \ + && make \ + && make install \ + && make clean +RUN cd /var/local/php-src-php-7.4.0 \ + && ./buildconf --force \ + && ./configure \ + --enable-maintainer-zts \ + --with-gmp \ + --with-openssl \ + --with-zlib \ + --prefix=/usr/local/php-7.4-zts \ + && make \ + && make install \ + && make clean + +RUN wget -O phpunit https://phar.phpunit.de/phpunit-8.phar \ + && chmod +x phpunit \ + && cp phpunit /usr/local/php-7.4/bin \ + && mv phpunit /usr/local/php-7.4-zts/bin + # Install php dependencies RUN apt-get clean && apt-get update && apt-get install -y --force-yes \ valgrind \ diff --git a/kokoro/linux/dockerfile/test/php_32bit/Dockerfile b/kokoro/linux/dockerfile/test/php_32bit/Dockerfile index f8027c48e75c..b40cb7003251 100644 --- a/kokoro/linux/dockerfile/test/php_32bit/Dockerfile +++ b/kokoro/linux/dockerfile/test/php_32bit/Dockerfile @@ -1,4 +1,4 @@ -FROM 32bit/debian:jessie +FROM i386/debian:jessie # Install dependencies. We start with the basic ones require to build protoc # and the C++ build @@ -20,6 +20,9 @@ RUN apt-get update && apt-get install -y \ parallel \ time \ wget \ + re2c \ + sqlite3 \ + libsqlite3-dev \ && apt-get clean # Install php dependencies @@ -218,6 +221,46 @@ RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.phar \ && cp phpunit /usr/local/php-7.3/bin \ && mv phpunit /usr/local/php-7.3-zts/bin +# php 7.4 +RUN wget https://ftp.gnu.org/gnu/bison/bison-3.0.1.tar.gz -O /var/local/bison-3.0.1.tar.gz +RUN cd /var/local \ + && tar -zxvf bison-3.0.1.tar.gz \ + && cd /var/local/bison-3.0.1 \ + && ./configure \ + && make \ + && make install + +RUN wget https://github.com/php/php-src/archive/php-7.4.0.tar.gz -O /var/local/php-7.4.0.tar.gz + +RUN cd /var/local \ + && tar -zxvf php-7.4.0.tar.gz + +RUN cd /var/local/php-src-php-7.4.0 \ + && ./buildconf --force \ + && ./configure \ + --enable-bcmath \ + --with-openssl \ + --with-zlib \ + --prefix=/usr/local/php-7.4 \ + && make \ + && make install \ + && make clean +RUN cd /var/local/php-src-php-7.4.0 \ + && ./buildconf --force \ + && ./configure \ + --enable-maintainer-zts \ + --with-openssl \ + --with-zlib \ + --prefix=/usr/local/php-7.4-zts \ + && make \ + && make install \ + && make clean + +RUN wget -O phpunit https://phar.phpunit.de/phpunit-8.phar \ + && chmod +x phpunit \ + && cp phpunit /usr/local/php-7.4/bin \ + && mv phpunit /usr/local/php-7.4-zts/bin + # Install php dependencies RUN apt-get clean && apt-get update && apt-get install -y --force-yes \ valgrind \