diff --git a/examples/php/echo/apache.Dockerfile b/examples/php/echo/apache.Dockerfile index bc910d45d0c..ed3f01b441c 100644 --- a/examples/php/echo/apache.Dockerfile +++ b/examples/php/echo/apache.Dockerfile @@ -44,6 +44,8 @@ COPY client.php ./index.php COPY composer.json . COPY echo.proto . +RUN chmod 644 index.php + RUN protoc -I=. echo.proto --php_out=. --grpc_out=. RUN composer install diff --git a/examples/php/echo/base.Dockerfile b/examples/php/echo/base.Dockerfile index 2ca37c7bda1..c64876f6cce 100644 --- a/examples/php/echo/base.Dockerfile +++ b/examples/php/echo/base.Dockerfile @@ -18,6 +18,8 @@ RUN apt-get -qq update && apt-get -qq install -y \ autoconf automake curl git libtool \ pkg-config unzip zlib1g-dev +ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/examples/php/echo/fpm.Dockerfile b/examples/php/echo/fpm.Dockerfile index f6924eadb86..6e2df8b013c 100644 --- a/examples/php/echo/fpm.Dockerfile +++ b/examples/php/echo/fpm.Dockerfile @@ -44,6 +44,8 @@ COPY client.php ./index.php COPY composer.json . COPY echo.proto . +RUN chmod 644 index.php + RUN protoc -I=. echo.proto --php_out=. --grpc_out=. RUN composer install diff --git a/src/php/docker/alpine/Dockerfile b/src/php/docker/alpine/Dockerfile index 03a9e73eaf7..3750e76416a 100644 --- a/src/php/docker/alpine/Dockerfile +++ b/src/php/docker/alpine/Dockerfile @@ -16,6 +16,8 @@ FROM php:7.2-alpine3.9 RUN apk add autoconf g++ make zlib-dev git bash wget +ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/src/php/docker/grpc-ext/Dockerfile b/src/php/docker/grpc-ext/Dockerfile index 4b9e898690c..3e794da4f60 100644 --- a/src/php/docker/grpc-ext/Dockerfile +++ b/src/php/docker/grpc-ext/Dockerfile @@ -18,6 +18,8 @@ RUN apt-get -qq update && apt-get -qq install -y \ autoconf automake git libtool pkg-config \ valgrind wget zlib1g-dev +ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/src/php/docker/grpc-src/Dockerfile b/src/php/docker/grpc-src/Dockerfile index 595ee37e2c3..d8a1099017a 100644 --- a/src/php/docker/grpc-src/Dockerfile +++ b/src/php/docker/grpc-src/Dockerfile @@ -18,6 +18,8 @@ RUN apt-get -qq update && apt-get -qq install -y \ autoconf automake git libtool pkg-config \ valgrind wget zlib1g-dev +ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/src/php/docker/php-future/Dockerfile b/src/php/docker/php-future/Dockerfile index a3625a807e7..8e887644a44 100644 --- a/src/php/docker/php-future/Dockerfile +++ b/src/php/docker/php-future/Dockerfile @@ -18,6 +18,8 @@ RUN apt-get -qq update && apt-get -qq install -y \ autoconf automake git libtool pkg-config \ wget zlib1g-dev +ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/src/php/docker/php-src/Dockerfile b/src/php/docker/php-src/Dockerfile index b225e00e402..443560fc091 100644 --- a/src/php/docker/php-src/Dockerfile +++ b/src/php/docker/php-src/Dockerfile @@ -36,6 +36,8 @@ RUN wget http://ftp.gnu.org/gnu/bison/bison-3.4.2.tar.gz && \ WORKDIR /github/php-src +ARG MAKEFLAGS=-j8 + RUN git clone https://github.com/php/php-src . RUN git checkout php-7.2.22 && \ diff --git a/src/php/docker/php-zts/Dockerfile b/src/php/docker/php-zts/Dockerfile index 1ce321c8fd7..1b8bf7d11ba 100644 --- a/src/php/docker/php-zts/Dockerfile +++ b/src/php/docker/php-zts/Dockerfile @@ -18,6 +18,8 @@ RUN apt-get -qq update && apt-get -qq install -y \ autoconf automake git libtool pkg-config \ wget zlib1g-dev +ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/src/php/docker/php5/Dockerfile b/src/php/docker/php5/Dockerfile index a6202559466..06b0e19e850 100644 --- a/src/php/docker/php5/Dockerfile +++ b/src/php/docker/php5/Dockerfile @@ -18,6 +18,8 @@ RUN apt-get -qq update && apt-get -qq install -y \ autoconf automake git libtool pkg-config \ valgrind wget zlib1g-dev +ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/templates/examples/php/echo/apache.Dockerfile.template b/templates/examples/php/echo/apache.Dockerfile.template index 4aac8eb194a..cc3358dcfd2 100644 --- a/templates/examples/php/echo/apache.Dockerfile.template +++ b/templates/examples/php/echo/apache.Dockerfile.template @@ -36,6 +36,8 @@ COPY composer.json . COPY echo.proto . + RUN chmod 644 index.php + RUN protoc -I=. echo.proto --php_out=. --grpc_out=. RUN composer install diff --git a/templates/examples/php/echo/base.Dockerfile.template b/templates/examples/php/echo/base.Dockerfile.template index d56b8619483..99f4fe0b983 100644 --- a/templates/examples/php/echo/base.Dockerfile.template +++ b/templates/examples/php/echo/base.Dockerfile.template @@ -20,6 +20,8 @@ autoconf automake curl git libtool ${'\\'} pkg-config unzip zlib1g-dev + ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/templates/examples/php/echo/fpm.Dockerfile.template b/templates/examples/php/echo/fpm.Dockerfile.template index 031dcd68bd4..d4ae320c9af 100644 --- a/templates/examples/php/echo/fpm.Dockerfile.template +++ b/templates/examples/php/echo/fpm.Dockerfile.template @@ -36,6 +36,8 @@ COPY composer.json . COPY echo.proto . + RUN chmod 644 index.php + RUN protoc -I=. echo.proto --php_out=. --grpc_out=. RUN composer install diff --git a/templates/src/php/docker/alpine/Dockerfile.template b/templates/src/php/docker/alpine/Dockerfile.template index 8bd0ca6ac4d..493b320e831 100644 --- a/templates/src/php/docker/alpine/Dockerfile.template +++ b/templates/src/php/docker/alpine/Dockerfile.template @@ -18,6 +18,8 @@ RUN apk add autoconf g++ make zlib-dev git bash wget + ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/templates/src/php/docker/grpc-ext/Dockerfile.template b/templates/src/php/docker/grpc-ext/Dockerfile.template index 23f2011d407..8dbfd35b065 100644 --- a/templates/src/php/docker/grpc-ext/Dockerfile.template +++ b/templates/src/php/docker/grpc-ext/Dockerfile.template @@ -20,6 +20,8 @@ autoconf automake git libtool pkg-config ${'\\'} valgrind wget zlib1g-dev + ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/templates/src/php/docker/grpc-src/Dockerfile.template b/templates/src/php/docker/grpc-src/Dockerfile.template index dcaf7cc8ea9..b04c77c2b63 100644 --- a/templates/src/php/docker/grpc-src/Dockerfile.template +++ b/templates/src/php/docker/grpc-src/Dockerfile.template @@ -20,6 +20,8 @@ autoconf automake git libtool pkg-config ${'\\'} valgrind wget zlib1g-dev + ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/templates/src/php/docker/php-future/Dockerfile.template b/templates/src/php/docker/php-future/Dockerfile.template index 4a5dfe960dc..f9abb2fc509 100644 --- a/templates/src/php/docker/php-future/Dockerfile.template +++ b/templates/src/php/docker/php-future/Dockerfile.template @@ -20,6 +20,8 @@ autoconf automake git libtool pkg-config ${'\\'} wget zlib1g-dev + ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/templates/src/php/docker/php-src/Dockerfile.template b/templates/src/php/docker/php-src/Dockerfile.template index e5c637bcb93..d048aa6e4b4 100644 --- a/templates/src/php/docker/php-src/Dockerfile.template +++ b/templates/src/php/docker/php-src/Dockerfile.template @@ -35,6 +35,8 @@ WORKDIR /github/php-src + ARG MAKEFLAGS=-j8 + RUN git clone https://github.com/php/php-src . RUN git checkout php-7.2.22 && ${'\\'} diff --git a/templates/src/php/docker/php-zts/Dockerfile.template b/templates/src/php/docker/php-zts/Dockerfile.template index 75675f08382..1190d61424d 100644 --- a/templates/src/php/docker/php-zts/Dockerfile.template +++ b/templates/src/php/docker/php-zts/Dockerfile.template @@ -20,6 +20,8 @@ autoconf automake git libtool pkg-config ${'\\'} wget zlib1g-dev + ARG MAKEFLAGS=-j8 + WORKDIR /tmp diff --git a/templates/src/php/docker/php5/Dockerfile.template b/templates/src/php/docker/php5/Dockerfile.template index e6c7b59c9e0..1f97bc50a71 100644 --- a/templates/src/php/docker/php5/Dockerfile.template +++ b/templates/src/php/docker/php5/Dockerfile.template @@ -20,6 +20,8 @@ autoconf automake git libtool pkg-config ${'\\'} valgrind wget zlib1g-dev + ARG MAKEFLAGS=-j8 + WORKDIR /tmp