From cdfba3cfd05718b8b79944984dd9dcdda35be55f Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngd.io>
Date: Fri, 17 Feb 2017 11:24:54 +0000
Subject: [PATCH] update to nginx 1.11.10/versioning/composer fix closes #95

---
 CHANGELOG          | 29 +++++++----------------------
 Dockerfile         |  2 +-
 README.md          | 10 ++++++----
 docs/versioning.md | 22 ++++++++++++++++++++++
 scripts/pull       |  2 +-
 scripts/start.sh   |  2 +-
 6 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 docs/versioning.md

diff --git a/CHANGELOG b/CHANGELOG
index 70fa10c..6aef345 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,28 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [1.1.2] - 2017-2-17
 ### Added
+- Bumped nginx version to 1.11.10
+- changed pull script to do composer install (container scripts 0.2.6)
+- added --no-dev to composer install thx @SamMousa
+- Moved to semver
 
-## [0.2.1] - 2016-7-13
+## [1.1.1] - 2017-2-14
 ### Added
-- Added options to set PHP values @richarvey
-- Added default to hide nginx and php version with overrride @richarvey
-
-## [0.2.0] - 2016-6-15
-### Added
-- updated to php7 @richarvey
-
-## [0.1.1] - 2016-6-15
-### Added
-- Added php5-gd, php5-intl, php5-memcache, php5-sqlite3, php5-pgsql, php5-xml, php5-xsl @richarvey
-
-## [0.1.0] - 2016-06-15
-### Added
-- Pull in alpine build @drobertson2
-- Merge git scripts from old stable @richarvey
-- Tested Tamplating @richarvey
-
-## [0.0.0] - 2016-6-14
-### Added
-- Port nginx/php fpm to alpine @danroberston2
+- Stable Release
diff --git a/Dockerfile b/Dockerfile
index d4e3809..55e0a4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf
 ENV php_vars /usr/local/etc/php/conf.d/docker-vars.ini
 ENV composer_hash 55d6ead61b29c7bdee5cccfb50076874187bd9f21f65d8991d46ec5cc90518f447387fb9f76ebae1fbbacf329e583e30
 
-ENV NGINX_VERSION 1.11.9
+ENV NGINX_VERSION 1.11.10
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
   && CONFIG="\
diff --git a/README.md b/README.md
index d88d87e..8ba2726 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,12 @@ 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.
 
-### Versions
-| Tag | Nginx | PHP | Alpine |
+### Versioning
+| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version |
 |-----|-------|-----|--------|
-| latest | 1.11.9 | 7.1.1 | 3.4 |
-| php71  | 1.11.9 | 7.1.1 | 3.4 |
+| latest | Master Branch |1.11.10 | 7.1.1 | 3.4 |
+
+For other tags please see: [versioning](docs/versioning.md)
 
 ### Links
 - [https://github.com/ngineered/nginx-php-fpm](https://github.com/ngineered/nginx-php-fpm)
@@ -38,6 +39,7 @@ For more detailed examples and explanations please refer to the documentation.
 ## Documentation
 
 - [Building from source](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/building.md)
+- [Versioning](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/versioning.md)
 - [Config Flags](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/config_flags.md)
 - [Git Auth](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_auth.md)
  - [Personal Access token](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_auth.md#personal-access-token)
diff --git a/docs/versioning.md b/docs/versioning.md
new file mode 100644
index 0000000..512a604
--- /dev/null
+++ b/docs/versioning.md
@@ -0,0 +1,22 @@
+## Versioning
+We are now introducing versioning so users can stick to specific versions of software. As we are dealing with three upstream sources (nginx, php and alpine) plus our own scripts this all gets a little complex, but this document will provide a definitive source of tags and versions.
+
+We will use the [semver](http://ricostacruz.com/cheatsheets/semver.html) style notation for versioning:
+
+>This follows the format MAJOR.MINOR.PATCH (eg, 1.2.6)
+>
+- MAJOR version changes to nginx, php-fpm, alpine or potential breaking feature changes
+- MINOR version changes to nginx, php-fpm or scripts that are still backwards-compatible with previous versions
+- PATCH version minor changes and bug fixes
+
+### Current versions and tags
+
+The latest tag will always follow the master branch in git. the other versions will have releases attached.
+
+| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
+|-----|-------|-----|--------|--------|
+| latest | Master Branch |1.11.10 | 7.1.1 | 3.4 | 0.2.6 |
+| 1.1.1 | 1.1.1 |1.11.9 | 7.1.1 | 3.4 |  0.2.5 |
+| 1.1.2 | 1.1.2 |1.11.10 | 7.1.1 | 3.4 |  0.2.6 |
+
+These tags will be created as releases on GitHub and as tags in docker hub.
diff --git a/scripts/pull b/scripts/pull
index d7e2dbc..4b71200 100755
--- a/scripts/pull
+++ b/scripts/pull
@@ -12,7 +12,7 @@ fi
 
 # Try auto install for composer
 if [ -f "$WEBROOT/composer.lock" ]; then
-  php composer.phar update
+  php composer.phar install --no-dev
 fi
 
 cd /var/www/html
diff --git a/scripts/start.sh b/scripts/start.sh
index fd94ca4..e45713e 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -59,7 +59,7 @@ fi
 
 # Try auto install for composer
 if [ -f "$WEBROOT/composer.lock" ]; then
-  php composer.phar install
+  php composer.phar install --no-dev
 fi
 
 # Enable custom nginx config files if they exist