From ceb866573cefeb05f723cb35d1480bf4fe97a206 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Tue, 9 Feb 2021 12:24:50 +0000 Subject: [PATCH 1/3] Bumping version to 1.3.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6261a05..d5e98f7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.1 \ No newline at end of file +1.3.2 \ No newline at end of file From 45ca05c8d3e0a15775f0ca487b4307d6ba7e2aa1 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Tue, 9 Feb 2021 12:25:09 +0000 Subject: [PATCH 2/3] Updating to use new prefixed helper configuration files --- 7.3/Dockerfile | 2 +- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- overlay/etc/nginx/sites/localhost.conf | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/7.3/Dockerfile b/7.3/Dockerfile index 6eba710..1d4b9b5 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.12-1.3.1 +FROM bcgdesign/nginx:alpine-3.12-1.3.2 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 99a6402..25e553e 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.13-1.3.1 +FROM bcgdesign/nginx:alpine-3.13-1.3.2 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index b88dd7c..017608e 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.13-1.3.1 +FROM bcgdesign/nginx:alpine-3.13-1.3.2 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/overlay/etc/nginx/sites/localhost.conf b/overlay/etc/nginx/sites/localhost.conf index 70088f4..cef5870 100644 --- a/overlay/etc/nginx/sites/localhost.conf +++ b/overlay/etc/nginx/sites/localhost.conf @@ -1,9 +1,9 @@ server { - include helpers/base.conf; + include helpers/nginx-base.conf; index index.php index.html index.htm; include helpers/nginx-error-pages.conf; + include helpers/nginx-ignore-favicon.conf; + include helpers/nginx-static-files.conf; include helpers/php-try-all.conf; include helpers/php-try-php.conf; - include helpers/ignore-favicon.conf; - include helpers/static-files.conf; } \ No newline at end of file From b8a51cfbf07b8fba29533252ce27713100aa22b8 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Tue, 9 Feb 2021 12:25:16 +0000 Subject: [PATCH 3/3] Adding helper configuration files to README --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 125af07..f6d123d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [Docker Repository](https://hub.docker.com/r/bcgdesign/nginx-php) - [bcg|design ecosystem](https://github.com/bencgreen/docker) -Nginx plus PHP (7.3.26, 7.4.15, and 8.0.2) - no SSL support etc, designed to be used behind a proxy server. Minimal PHP packages are installed: +Nginx plus PHP (7.3.27, 7.4.15, and 8.0.2) - no SSL support etc, designed to be used behind a proxy server. Minimal PHP packages are installed: * `php7` or `php8` * `php7-common` or `php8-common` @@ -21,6 +21,7 @@ Additionally, `bash` is installed as it is required by some of the setup scripts * [Volumes](#volumes) * [Environment Variables](#environment-variables) * [Helper Functions](#helper-functions) +* [Nginx Configuration Helpers](#nginx-configuration-helpers) * [Authors / Licence / Copyright](#authors) ## Ports @@ -66,6 +67,15 @@ The following environment variables will override values in `php-fpm.d/www.conf` | -------------------- | --------- | ----------------------------------------------------------- | | `php-clean-sessions` | *None* | Cleans PHP session information - the cron runs this hourly. | +## Nginx Configuration Helpers + +The image contains a handful of useful Nginx configuration 'helper' files, which you can find in `/overlay/etc/nginx/helpers`. They all begin with the prefix 'php': + +| Helper | Description | +| --------------- | ---------------------------------------------------------- | +| `-try-all.conf` | Enables SEO-friendly URLs (e.g. without `index.php`). | +| `-try-php.conf` | Sends the request to upstream PHP FastCGI Process Manager. | + ## Authors * [Ben Green](https://github.com/bencgreen)