SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update versions in repo

Browse Source
This commit is contained in:
Ric Harvey
2018-06-17 21:41:57 +01:00
parent 67c48e67a9
commit 6a018f0d0d
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -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. If you have improvements or suggestions please open an issue or pull request on the GitHub project page.
### Versioning ### 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 | | latest | Master Branch |1.14.0 | 7.2.6 | 3.6 |
| 1.5.0 | 7.2 Branch |1.14.0 | 7.2.4 | 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) For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md)

19
docs/versioning.md
View File

@@ -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. 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 #### 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 | | 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 | | 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.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 |
#### 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. These tags will be created as releases on GitHub and as tags in docker hub.
### Unmaintained tags: ### Unmaintained tags: