Skip to content

Commit 6a0dc36

Browse files
Update readme's to reflect changed php image source locations
1 parent b18a571 commit 6a0dc36

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ internal services and for the application templates.
2222
- [Varnish 4.0](drupal8-varnish/4.0/)
2323
- [eZ Platform 6.x](ez/6.x/)
2424
- *General PHP*
25-
- [Apache w/ PHP (5.6, 7.0, 7.1)](php-apache/)
26-
- [NGINX w/ PHP-FPM (5.6, 7.0, 7.1)](php-nginx/)
25+
- [Apache w/ PHP (5.6, 7.0, 7.1)](php/apache/)
26+
- [NGINX w/ PHP-FPM (5.6, 7.0, 7.1)](php/nginx/)
2727
- [Magento 1](magento1-nginx/fpm-5.6/)
2828
- *Magento 2*
2929
- [NGINX w/ PHP-FPM 7.0](magento2-nginx/fpm-7.0/)

drupal/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ This allows you to define and override bash functions that the base images add.
108108

109109
In addition to the bash functions defined in this base image's parent images:
110110
[the base image functions](../../ubuntu/16.04/README.md#custom-build-and-startup-scripts)
111-
[the php-apache image functions](../../php-apache/README.md#custom-build-and-startup-scripts)
111+
[the php-apache image functions](../../php/apache/README.md#custom-build-and-startup-scripts)
112112

113113
This base image adds the following bash functions:
114114

magento1/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ This allows you to define and override bash functions that the base images add.
5252

5353
In addition to the bash functions defined in this base image's parent images:
5454
* [the base image functions](../../ubuntu/16.04/README.md#custom-build-and-startup-scripts)
55-
* [the php-nginx image functions](../../php-nginx/README.md#custom-build-and-startup-scripts)
56-
* [the php-apache image functions](../../php-apache/README.md#custom-build-and-startup-scripts)
55+
* [the php-nginx image functions](../../php/nginx/README.md#custom-build-and-startup-scripts)
56+
* [the php-apache image functions](../../php/apache/README.md#custom-build-and-startup-scripts)
5757

5858
This base image adds the following bash functions:
5959

magento2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This allows you to define and override bash functions that the base images add.
5959

6060
In addition to the bash functions defined in this base image's parent images:
6161
* [the base image functions](../../ubuntu/16.04/README.md#custom-build-and-startup-scripts)
62-
* [the php-nginx image functions](../../php-nginx/README.md#custom-build-and-startup-scripts)
62+
* [the php-nginx image functions](../../php/nginx/README.md#custom-build-and-startup-scripts)
6363

6464
This base image adds the following bash functions:
6565

php/nginx/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ WEB_INCLUDES | A space separated list of files in /etc/nginx/sites-enabled/ to i
127127
WEB_DEFAULT_SERVER | True if the virtual host should be used for any unmatched traffic | true/false | true
128128
APP_ENDPOINT | The uri of the web application php endpoint | domain relative uri | /index.php
129129
APP_ENDPOINT_REWRITE | Determines whether to rewrite urls that don't match webroot files to the APP_ENDPOINT | true/false | true
130-
APP_ENDPOINT_REGEX | A regex used to define allowed application endpoints, see [site_phpfpm.conf.tmpl](https://github.com/continuouspipe/dockerfiles/blob/master/php-nginx/etc/confd/templates/nginx/site_phpfpm.conf.tmpl#L1) | string | auto-detected
130+
APP_ENDPOINT_REGEX | A regex used to define allowed application endpoints, see [site_phpfpm.conf.tmpl](https://github.com/continuouspipe/dockerfiles/blob/master/php/nginx/etc/confd/templates/nginx/site_phpfpm.conf.tmpl#L1) | string | auto-detected
131131
APP_ENDPOINT_STRICT | Restricts allowed application endpoints to only that of the APP_ENDPOINT environment variable | true/false | false
132132
ASSETS_CLEANUP | Whether to delete the assets in ASSETS_PATH after they have been applied | true/false | true
133133
ASSETS_ENV | The assets environment assets are downloaded/applied from. If unset no asset actions will happen | a asset environment |

symfony/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ SYMFONY_CONSOLE | The location of the Symfony console script | file path | auto-
7777
SYMFONY_WEB_APP_ENV_REWRITE | Whether to use web/app_*.php when SYMFONY_ENV != prod | true, false | false
7878
APP_ENDPOINT | The uri of the web application php endpoint | domain relative uri | auto-detected based on SYMFONY_ENV and SYMFONY_WEB_APP_ENV_REWRITE
7979
APP_ENDPOINT_REWRITE | Determines whether to redirect urls that don't match webroot files to the APP_ENDPOINT | true/false | true
80-
APP_ENDPOINT_REGEX | A regex used to define allowed application endpoints, see [site_phpfpm.conf.tmpl](https://github.com/continuouspipe/dockerfiles/blob/master/php-nginx/etc/confd/templates/nginx/site_phpfpm.conf.tmpl#L1) | string | auto-detected
80+
APP_ENDPOINT_REGEX | A regex used to define allowed application endpoints, see [site_phpfpm.conf.tmpl](https://github.com/continuouspipe/dockerfiles/blob/master/php/nginx/etc/confd/templates/nginx/site_phpfpm.conf.tmpl#L1) | string | auto-detected
8181
APP_ENDPOINT_STRICT | Restricts allowed application endpoints to only that of the APP_ENDPOINT environment variable | true/false | true
8282

8383
The following variables have had their defaults changed from the php-nginx image so that Symfony runs better:
@@ -99,8 +99,8 @@ This allows you to define and override bash functions that the base images add.
9999

100100
In addition to the bash functions defined in this base image's parent images:
101101
* [the base image functions](../ubuntu/16.04/README.md#custom-build-and-startup-scripts)
102-
* either [the php-nginx image functions](../php-nginx/README.md#custom-build-and-startup-scripts)
103-
* or [the php-apache image functions](../php-apache/README.md#custom-build-and-startup-scripts)
102+
* either [the php-nginx image functions](../php/nginx/README.md#custom-build-and-startup-scripts)
103+
* or [the php-apache image functions](../php/apache/README.md#custom-build-and-startup-scripts)
104104

105105
This base image adds the following bash functions:
106106

0 commit comments

Comments
 (0)