Skip to content

Commit 34e3c96

Browse files
author
Ric Harvey
committed
Update nginx version to 10.12.0
1 parent 79efb31 commit 34e3c96

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM php:7.1.2-fpm-alpine
1+
FROM php:7.1.3-fpm-alpine
22

33
MAINTAINER ngineered <support@ngineered.co.uk>
44

55
ENV php_conf /usr/local/etc/php-fpm.conf
66
ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf
77
ENV php_vars /usr/local/etc/php/conf.d/docker-vars.ini
88

9-
ENV NGINX_VERSION 1.11.10
9+
ENV NGINX_VERSION 1.12.0
1010

1111
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
1212
&& CONFIG="\

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
1010
### Versioning
1111
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version |
1212
|-----|-------|-----|--------|--------|
13-
| latest | Master Branch |1.11.10 | 7.1.2 | 3.4 |
13+
| latest | Master Branch |1.12.0 | 7.1.3 | 3.4 |
1414

1515
For other tags please see: [versioning](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/versioning.md)
1616

docs/versioning.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ The latest tag will always follow the master branch in git. the other versions w
2222
| 1.1.4 | 1.1.4 |1.11.10 | 7.1.2 | 3.4 | 0.2.6 |
2323
| 1.1.5 | 1.1.5 |1.11.10 | 7.1.2 | 3.4 | 0.2.7 |
2424
| 1.1.6 | 1.1.6 |1.11.10 | 7.1.2 | 3.4 | 0.2.8 |
25+
| 1.2.0 | 1.2.0 |1.12.10 | 7.1.3 | 3.4 | 0.2.9 |
2526

2627
These tags will be created as releases on GitHub and as tags in docker hub.
2728

0 commit comments

Comments
 (0)