diff --git a/README.md b/README.md index 34fbb02..c559d49 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ If you have improvements or suggestions please open an issue or pull request on ### Versioning | Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | |-----|-------|-----|--------|--------| -| 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 | +| latest | Master Branch |1.14.0 | 7.2.6 | 3.7 | +| 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) diff --git a/docs/versioning.md b/docs/versioning.md index 96a22e3..963ef17 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -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.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 | +| 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 | 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.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. - -### Unmaintained tags: +### Legacy tags: - php5 - php7