Merge branch 'release/5.1.2'

webdevops · May 25, 2016 · a6890ae · a6890ae
2 parents ebc0b95 + ef0a7c4
commit a6890ae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 PHP Docker Boilerplate Changelog
 ==================================
 
+5.1.2 - 2016-05-25
+------------------
+- Fix typo in Docker image names (duplicate -dev)
+
 5.1.1 - 2016-05-24
 ------------------
 - Fixed Docker image names in Dockerfile.development

diff --git a/Dockerfile.development b/Dockerfile.development
@@ -26,16 +26,16 @@
 #   webdevops/php-apache-dev:debian-9
 #
 # Nginx:
-#   webdevops/php-nginx-dev-dev:ubuntu-12.04
-#   webdevops/php-nginx-dev-dev:ubuntu-14.04
-#   webdevops/php-nginx-dev-dev:ubuntu-15.04
-#   webdevops/php-nginx-dev-dev:ubuntu-15.10
-#   webdevops/php-nginx-dev-dev:ubuntu-16.04
-#   webdevops/php-nginx-dev-dev:centos-7
-#   webdevops/php-nginx-dev-dev:debian-7
-#   webdevops/php-nginx-dev-dev:debian-8
-#   webdevops/php-nginx-dev-dev:debian-8-php7
-#   webdevops/php-nginx-dev-dev:debian-9
+#   webdevops/php-nginx-dev:ubuntu-12.04
+#   webdevops/php-nginx-dev:ubuntu-14.04
+#   webdevops/php-nginx-dev:ubuntu-15.04
+#   webdevops/php-nginx-dev:ubuntu-15.10
+#   webdevops/php-nginx-dev:ubuntu-16.04
+#   webdevops/php-nginx-dev:centos-7
+#   webdevops/php-nginx-dev:debian-7
+#   webdevops/php-nginx-dev:debian-8
+#   webdevops/php-nginx-dev:debian-8-php7
+#   webdevops/php-nginx-dev:debian-9
 #
 # HHVM:
 #   webdevops/hhvm-apache

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Dockerized PHP web project boilerplate
 
-[![latest v5.1.1](https://img.shields.io/badge/latest-v5.1.1-green.svg?style=flat)](https://github.com/webdevops/php-docker-boilerplate/releases/tag/5.1.1)
+[![latest v5.1.2](https://img.shields.io/badge/latest-v5.1.2-green.svg?style=flat)](https://github.com/webdevops/php-docker-boilerplate/releases/tag/5.1.2)
 ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Percentage of issues still open")