From 0f31e94d5ac8712290acbd529349d4fc73f13ab7 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 25 May 2016 16:07:54 +0200 Subject: [PATCH 1/2] Fix duplicate -dev in docker names --- CHANGELOG.md | 4 ++++ Dockerfile.development | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bdf1c1..477102c 100644 --- 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 index 0cc55e8..5c1ce6e 100644 --- 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 From ef0a7c45588e8ed3f2a016733d32f65a33714f02 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 25 May 2016 16:08:16 +0200 Subject: [PATCH 2/2] Version bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a49f81d..c22e4b5 100644 --- 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")