Merge pull request #367 from continuouspipe/feature/php-images-merge

Merge the shared sources of php-apache and php-nginx images

Author: andytson-inviqa

README.md

@@ -22,8 +22,8 @@ internal services and for the application templates.
     - [Varnish 4.0](drupal8-varnish/4.0/)
 - [eZ Platform 6.x](ez/6.x/)
 - *General PHP*
-    - [Apache w/ PHP (5.6, 7.0, 7.1)](php-apache/)
-    - [NGINX w/ PHP-FPM (5.6, 7.0, 7.1)](php-nginx/)
+    - [Apache w/ PHP (5.6, 7.0, 7.1)](php/apache/)
+    - [NGINX w/ PHP-FPM (5.6, 7.0, 7.1)](php/nginx/)
 - [Magento 1](magento1-nginx/fpm-5.6/)
 - *Magento 2*
     - [NGINX w/ PHP-FPM 7.0](magento2-nginx/fpm-7.0/)

docker-compose.yml

@@ -276,7 +276,8 @@ services:
 
   php71_apache:
     build:
-      context: ./php-apache/
+      context: ./php/
+      dockerfile: Dockerfile-apache
       args:
         PHP_VERSION: 7.1
     image: quay.io/continuouspipe/php7.1-apache:latest
@@ -285,7 +286,8 @@ services:
 
   php70_apache:
     build:
-      context: ./php-apache/
+      context: ./php/
+      dockerfile: Dockerfile-apache
       args:
         PHP_VERSION: 7.0
     image: quay.io/continuouspipe/php7-apache:latest
@@ -294,7 +296,8 @@ services:
 
   php56_apache:
     build:
-      context: ./php-apache/
+      context: ./php/
+      dockerfile: Dockerfile-apache
       args:
         PHP_VERSION: 5.6
     image: quay.io/continuouspipe/php5.6-apache:latest
@@ -303,7 +306,8 @@ services:
 
   php71_nginx:
     build:
-      context: ./php-nginx/
+      context: ./php/
+      dockerfile: Dockerfile-nginx
       args:
         PHP_VERSION: 7.1
     image: quay.io/continuouspipe/php7.1-nginx:latest
@@ -312,7 +316,8 @@ services:
 
   php70_nginx:
     build:
-      context: ./php-nginx/
+      context: ./php/
+      dockerfile: Dockerfile-nginx
       args:
         PHP_VERSION: 7.0
     image: quay.io/continuouspipe/php7-nginx:latest
@@ -321,7 +326,8 @@ services:
 
   php56_nginx:
     build:
-      context: ./php-nginx/
+      context: ./php/
+      dockerfile: Dockerfile-nginx
       args:
         PHP_VERSION: 5.6
     image: quay.io/continuouspipe/php5.6-nginx:latest

drupal/README.md

@@ -108,7 +108,7 @@ This allows you to define and override bash functions that the base images add.
 
 In addition to the bash functions defined in this base image's parent images:
 [the base image functions](../../ubuntu/16.04/README.md#custom-build-and-startup-scripts)
-[the php-apache image functions](../../php-apache/README.md#custom-build-and-startup-scripts)
+[the php-apache image functions](../../php/apache/README.md#custom-build-and-startup-scripts)
 
 This base image adds the following bash functions:
 

magento1/README.md

@@ -52,8 +52,8 @@ This allows you to define and override bash functions that the base images add.
 
 In addition to the bash functions defined in this base image's parent images:
 * [the base image functions](../../ubuntu/16.04/README.md#custom-build-and-startup-scripts)
-* [the php-nginx image functions](../../php-nginx/README.md#custom-build-and-startup-scripts)
-* [the php-apache image functions](../../php-apache/README.md#custom-build-and-startup-scripts)
+* [the php-nginx image functions](../../php/nginx/README.md#custom-build-and-startup-scripts)
+* [the php-apache image functions](../../php/apache/README.md#custom-build-and-startup-scripts)
 
 This base image adds the following bash functions:
 

magento2/README.md

@@ -59,7 +59,7 @@ This allows you to define and override bash functions that the base images add.
 
 In addition to the bash functions defined in this base image's parent images:
 * [the base image functions](../../ubuntu/16.04/README.md#custom-build-and-startup-scripts)
-* [the php-nginx image functions](../../php-nginx/README.md#custom-build-and-startup-scripts)
+* [the php-nginx image functions](../../php/nginx/README.md#custom-build-and-startup-scripts)
 
 This base image adds the following bash functions: