diff --git a/Dockerfile b/Dockerfile index c1c3071..88ce9d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2.8-fpm-alpine +FROM php:7.2.10-fpm-alpine LABEL maintainer="Ric Harvey " diff --git a/README.md b/README.md index 86d2d7e..a09d64a 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ 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.8 | 3.7 | -| 1.5.5 | 7.2 Branch |1.14.0 | 7.2.8 | 3.7 | +| latest/1.5.7 | Master Branch |1.14.0 | 7.2.10 | 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 e95cfc7..a8c26ae 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -24,7 +24,9 @@ The latest tag will always follow the master branch in git. the other versions w | 1.5.2 | 7.2.6 |1.14.0 | 3.7 | 0.3.7 | | 1.5.3 | 7.2.7 |1.14.0 | 3.7 | 0.3.7 | | 1.5.4 | 7.2.7 |1.14.0 | 3.7 | 0.3.8 | -| 1.5.5 | 7.2.7 |1.14.0 | 3.7 | 0.3.8 | +| 1.5.5 | 7.2.8 |1.14.0 | 3.7 | 0.3.8 | +| 1.5.6 | 7.2.9 |1.14.0 | 3.7 | 0.3.8 | +| 1.5.7 | 7.2.10 |1.14.0 | 3.7 | 0.3.8 | These tags will be created on GitLab and as tags in docker hub.