Merge pull request #20944 from stanley-cheung/php-update-dockerfiles

PHP: update dockerfiles to allow them to be run on release branches

src/php/docker/alpine/Dockerfile

@@ -28,10 +28,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
 
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && \
+COPY . .
-  git submodule update --init
-
-COPY src/ ./src
 
 RUN pear package && \
   find . -name grpc-*.tgz | xargs -I{} pecl install {}

src/php/docker/grpc-ext/Dockerfile

@@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
 
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && \
+COPY . .
-  git submodule update --init
-
-COPY src/ ./src
 
 RUN pear package && \
   find . -name grpc-*.tgz | xargs -I{} pecl install {}

src/php/docker/grpc-src/Dockerfile

@@ -30,16 +30,12 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
 
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && \
+COPY . .
-  git submodule update --init && \
-  make && make install
 
+RUN make && make install
 
-WORKDIR /github/grpc/src/php/ext/grpc
 
-COPY src/php/ext/grpc/*.c ./
+WORKDIR /github/grpc/src/php/ext/grpc
-COPY src/php/ext/grpc/*.h ./
-COPY src/php/ext/grpc/config.m4 ./
 
 RUN phpize && \
   ./configure --enable-tests && \

src/php/docker/php-future/Dockerfile

@@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
 
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && \
+COPY . .
-  git submodule update --init
-
-COPY src/ ./src
 
 RUN pear package && \
   find . -name grpc-*.tgz | xargs -I{} pecl install {}

src/php/docker/php-src/Dockerfile

@@ -52,10 +52,7 @@ RUN git checkout php-7.2.22 && \
 
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && \
+COPY . .
-  git submodule update --init
-
-COPY src/ ./src
 
 RUN pear package && \
   find . -name grpc-*.tgz | xargs -I{} pecl install {}

src/php/docker/php-zts/Dockerfile

@@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
 
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && \
+COPY . .
-  git submodule update --init
-
-COPY src/ ./src
 
 RUN pear package && \
   find . -name grpc-*.tgz | xargs -I{} pecl install {}

src/php/docker/php5/Dockerfile

@@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
 
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && \
+COPY . .
-  git submodule update --init
-
-COPY src/ ./src
 
 RUN pear package && \
   find . -name grpc-*.tgz | xargs -I{} pecl install {}

templates/src/php/docker/grpc-src/Dockerfile.template

@@ -29,16 +29,12 @@
 
   WORKDIR /github/grpc
 
-  RUN git clone https://github.com/grpc/grpc . && ${'\\'}
+  COPY . .
-    git submodule update --init && ${'\\'}
-    make && make install
 
+  RUN make && make install
 
-  WORKDIR /github/grpc/src/php/ext/grpc
 
-  COPY src/php/ext/grpc/*.c ./
+  WORKDIR /github/grpc/src/php/ext/grpc
-  COPY src/php/ext/grpc/*.h ./
-  COPY src/php/ext/grpc/config.m4 ./
 
   RUN phpize && ${'\\'}
     ./configure --enable-tests && ${'\\'}

templates/src/php/docker/pecl_ext_build_src.include

@@ -1,9 +1,6 @@
 WORKDIR /github/grpc
 
-RUN git clone https://github.com/grpc/grpc . && ${'\\'}
+COPY . .
-  git submodule update --init
-
-COPY src/ ./src
 
 RUN pear package && ${'\\'}
   find . -name grpc-*.tgz | xargs -I{} pecl install {}