Skip to content

Commit 2c81435

Browse files
authored
v1.3.2 (#12)
Major updates * Using latest Nginx base image * Using new prefixed helper configuration files Documentation updates * Adding helper configuration files to README
1 parent 360ee96 commit 2c81435

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

7.3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bcgdesign/nginx:alpine-3.12-1.3.1
1+
FROM bcgdesign/nginx:alpine-3.12-1.3.2
22

33
LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
44
org.label-schema.name="Nginx + PHP" \

7.4/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bcgdesign/nginx:alpine-3.13-1.3.1
1+
FROM bcgdesign/nginx:alpine-3.13-1.3.2
22

33
LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
44
org.label-schema.name="Nginx + PHP" \

8.0/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bcgdesign/nginx:alpine-3.13-1.3.1
1+
FROM bcgdesign/nginx:alpine-3.13-1.3.2
22

33
LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
44
org.label-schema.name="Nginx + PHP" \

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[Docker Repository](https://hub.docker.com/r/bcgdesign/nginx-php) - [bcg|design ecosystem](https://github.com/bencgreen/docker)
66

7-
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:
7+
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:
88

99
* `php7` or `php8`
1010
* `php7-common` or `php8-common`
@@ -21,6 +21,7 @@ Additionally, `bash` is installed as it is required by some of the setup scripts
2121
* [Volumes](#volumes)
2222
* [Environment Variables](#environment-variables)
2323
* [Helper Functions](#helper-functions)
24+
* [Nginx Configuration Helpers](#nginx-configuration-helpers)
2425
* [Authors / Licence / Copyright](#authors)
2526

2627
## Ports
@@ -66,6 +67,15 @@ The following environment variables will override values in `php-fpm.d/www.conf`
6667
| -------------------- | --------- | ----------------------------------------------------------- |
6768
| `php-clean-sessions` | *None* | Cleans PHP session information - the cron runs this hourly. |
6869

70+
## Nginx Configuration Helpers
71+
72+
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':
73+
74+
| Helper | Description |
75+
| --------------- | ---------------------------------------------------------- |
76+
| `-try-all.conf` | Enables SEO-friendly URLs (e.g. without `index.php`). |
77+
| `-try-php.conf` | Sends the request to upstream PHP FastCGI Process Manager. |
78+
6979
## Authors
7080

7181
* [Ben Green](https://github.com/bencgreen)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.1
1+
1.3.2
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
server {
2-
include helpers/base.conf;
2+
include helpers/nginx-base.conf;
33
index index.php index.html index.htm;
44
include helpers/nginx-error-pages.conf;
5+
include helpers/nginx-ignore-favicon.conf;
6+
include helpers/nginx-static-files.conf;
57
include helpers/php-try-all.conf;
68
include helpers/php-try-php.conf;
7-
include helpers/ignore-favicon.conf;
8-
include helpers/static-files.conf;
99
}

0 commit comments

Comments
 (0)