Merge remote-tracking branch 'origin/master' into php/upgrade-v7.1.4

rtucek · rtucek · commit 08c1ce4b691e · 2017-04-12T01:25:41.000+02:00
Fix merge conflict.

* origin/master:
  Upgrade to Nginx v1.11.13
  Upgrade Nginx to v1.11.12
  Add badges for changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ##### Tag v0.4.1 (2017-03-28)
+[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own commit badge on microbadger.com")
 
 - Bump PHP to v7.1.3
 - Bump Nginx version to v1.11.11
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ LABEL \
     org.label-schema.version=${VERSION}
 
 ENV \
-    NGINX_VERSION=1.11.11 \
+    NGINX_VERSION=1.11.13 \
     PHP_VERSION=7.1.4 \
     XDEBUG_VERSION=2.5.0 \
     VERSION=${VERSION}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`##### Tag v0.4.1 (2017-03-28)`
	`2`	+[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own commit badge on microbadger.com")
`2`	`3`
`3`	`4`	`- Bump PHP to v7.1.3`
`4`	`5`	`- Bump Nginx version to v1.11.11`