From 6a018f0d0d5320ba24db10a847fcf2c2ef3f21b9 Mon Sep 17 00:00:00 2001 From: Ric Harvey Date: Sun, 17 Jun 2018 21:41:57 +0100 Subject: [PATCH] update versions in repo --- README.md | 6 +++--- docs/versioning.md | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a0d0bb7..45d9655 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ This is a Dockerfile/image to build a container for nginx and php-fpm, with the If you have improvements or suggestions please open an issue or pull request on the GitHub project page. ### Versioning -| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | +| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | |-----|-------|-----|--------|--------| -| latest | Master Branch |1.14.0 | 7.2.4 | 3.6 | -| 1.5.0 | 7.2 Branch |1.14.0 | 7.2.4 | 3.6 | +| latest | Master Branch |1.14.0 | 7.2.6 | 3.6 | +| 1.5.1 | 7.2 Branch |1.14.0 | 7.2.6 | 3.6 | For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md) diff --git a/docs/versioning.md b/docs/versioning.md index 37d6ecf..96a22e3 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -13,9 +13,18 @@ We will use the [semver](http://ricostacruz.com/cheatsheets/semver.html) style n The latest tag will always follow the master branch in git. the other versions will have releases attached. +#### PHP 7.2 + +| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | Container Scripts | +|-----|-------|-----|--------|--------|--------| +| 1.4.0 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.5 | +| 1.4.1 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.6 | +| 1.5.0 | 7.2.4 |1.14.0 | 7.2.4 | 3.6 | 0.3.6 | +| 1.5.1 | 7.2.6 |1.14.0 | 7.2.4 | 3.6 | 0.3.6 | + #### PHP 7.1 -| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts | +| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | Container Scripts | |-----|-------|-----|--------|--------|--------| | latest | Master Branch |1.13.2 | 7.1.7 | 3.4 | 0.2.9 | | 1.1.1 | 1.1.1 |1.11.9 | 7.1.1 | 3.4 | 0.2.5 | @@ -43,14 +52,6 @@ The latest tag will always follow the master branch in git. the other versions w | 1.3.9 | 1.3.9 |1.13.7 | 7.1.11 | 3.4 | 0.3.3 | | 1.3.10 | 1.3.10 |1.13.7 | 7.1.12 | 3.4 | 0.3.4 | -#### PHP 7.2 - -| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts | -|-----|-------|-----|--------|--------|--------| -| 1.4.0 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.5 | -| 1.4.1 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.6 | -| 1.5.0 | 7.2.4 |1.14.0 | 7.2.4 | 3.6 | 0.3.6 | - These tags will be created as releases on GitHub and as tags in docker hub. ### Unmaintained tags: