PHP: update dockerfiles to add MAKEFLAGS=-j8

gracelicd · Oct 29, 2019 · 220c4de · 220c4de
1 parent 0856e26
commit 220c4de
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,6 +20,8 @@
     autoconf automake git libtool pkg-config ${'\\'}
     valgrind wget zlib1g-dev
 
+  ARG MAKEFLAGS=-j8
+
 
   WORKDIR /tmp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,6 +18,8 @@

		RUN apk add autoconf g++ make zlib-dev git bash wget

		ARG MAKEFLAGS=-j8


		WORKDIR /tmp

Expand Down