Prep doc fo 1.5.2 release

This commit is contained in:
Ric Harvey
2018-06-19 11:04:48 +01:00
parent 17c77147ea
commit 11a553aad6
2 changed files with 8 additions and 6 deletions

View File

@@ -10,8 +10,8 @@ If you have improvements or suggestions please open an issue or pull request on
### Versioning ### Versioning
| Docker Tag | Git 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.6 | 3.6 | | latest | Master Branch |1.14.0 | 7.2.6 | 3.7 |
| 1.5.1 | 7.2 Branch |1.14.0 | 7.2.6 | 3.6 | | 1.5.2 | 7.2 Branch |1.14.0 | 7.2.6 | 3.7 |
For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md) For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md)

View File

@@ -20,8 +20,12 @@ The latest tag will always follow the master branch in git. the other versions w
| 1.4.0 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.5 | | 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.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.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 | | 1.5.1 | 7.2.6 |1.14.0 | 7.2.4 | 3.7 | 0.3.6 |
| 1.5.2 | 7.2.6 |1.14.0 | 7.2.4 | 3.7 | 0.3.7 |
These tags will be created on GitLab and as tags in docker hub.
### Unmaintained tags:
#### PHP 7.1 #### PHP 7.1
| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | Container Scripts | | Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
@@ -52,9 +56,7 @@ 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.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 | | 1.3.10 | 1.3.10 |1.13.7 | 7.1.12 | 3.4 | 0.3.4 |
These tags will be created as releases on GitHub and as tags in docker hub. ### Legacy tags:
### Unmaintained tags:
- php5 - php5
- php7 - php7