Skip to content

Commit

Permalink
Update nginx version to 10.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Ric Harvey committed Apr 18, 2017
1 parent 79efb31 commit 34e3c96
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:7.1.2-fpm-alpine
FROM php:7.1.3-fpm-alpine

MAINTAINER ngineered <[email protected]>

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

ENV NGINX_VERSION 1.11.10
ENV NGINX_VERSION 1.12.0

RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& CONFIG="\
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
### Versioning
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version |
|-----|-------|-----|--------|--------|
| latest | Master Branch |1.11.10 | 7.1.2 | 3.4 |
| latest | Master Branch |1.12.0 | 7.1.3 | 3.4 |

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

Expand Down
1 change: 1 addition & 0 deletions docs/versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ The latest tag will always follow the master branch in git. the other versions w
| 1.1.4 | 1.1.4 |1.11.10 | 7.1.2 | 3.4 | 0.2.6 |
| 1.1.5 | 1.1.5 |1.11.10 | 7.1.2 | 3.4 | 0.2.7 |
| 1.1.6 | 1.1.6 |1.11.10 | 7.1.2 | 3.4 | 0.2.8 |
| 1.2.0 | 1.2.0 |1.12.10 | 7.1.3 | 3.4 | 0.2.9 |

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

Expand Down

0 comments on commit 34e3c96

Please sign in to comment.