From 0784a40b3eb38a6ed75bceefe63cafca2ecb8fbd Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 6 Jan 2017 09:31:15 +0100 Subject: [PATCH 1/3] Update badges Use badges from rtucek/nginx-php Mark un-rebuildable images as "UNRELEASED" --- CHANGELOG.md | 13 ++++++++----- README.md | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b03aee5..2b19077 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,34 +1,37 @@ ##### Tag v0.3.0 (2016-12-31) +##### Tag v0.3.0 (2016-12-31) +[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.3.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.3.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.0 "Get your own version badge on microbadger.com") - Add Travis CI - #1 - Add Xdebug - #2 ##### Tag v0.2.1 (2016-12-31) -[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.2.1.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.2.1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.2.1.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.2.1 "Get your own version badge on microbadger.com") +[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.2.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.2.1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.2.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.2.1 "Get your own version badge on microbadger.com") - Remove misleading comments - #3 - Add badges and make headings smaller - #4 - Bump up Nginx to v1.11.8 - #5 ##### Tag v0.2.0 (2016-12-25) -[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.2.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.2.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.2.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.2.0 "Get your own version badge on microbadger.com") +[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.2.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.2.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.2.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.2.0 "Get your own version badge on microbadger.com") - Upgrade to PHP v7.1.0 - Add badges to README.md (powered by microbadger.com). ##### TAG v0.1.2 (2016-19-12) -[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.1.2.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.2 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.1.2.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.2 "Get your own version badge on microbadger.com") +[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.1.2.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.1.2 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.1.2.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.1.2 "Get your own version badge on microbadger.com") - Fix PHP composer installer. ##### TAG v0.1.1 (2016-18-12) +UNRELEASED - Update Nginx to v1.11.7. - Update PHP to v7.0.14. - Fix permission on mounted volumes (see commit `9568fc3`). ##### TAG v0.1.0 (2016-12-16) -[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.1.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.1.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0 "Get your own version badge on microbadger.com") +UNRELEASED Initial release - Compile Nginx v1.11.6 from source. @@ -37,7 +40,7 @@ Initial release - Install Honcho for process monitoring. ##### TAG v0.1.0-RC1 (2016-12-01) -[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.1.0-RC1.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0-RC1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.1.0-RC1.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0-RC1 "Get your own version badge on microbadger.com") +UNRELEASED Initial release - Compile Nginx v1.11.6 from source. diff --git a/README.md b/README.md index 4e721b4..0bf346f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/rtucek/nginx-php.svg?branch=master)](https://travis-ci.org/rtucek/nginx-php) [![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php.svg)](https://microbadger.com/images/janus1990/docker-nginx-php "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php.svg)](https://microbadger.com/images/janus1990/docker-nginx-php "Get your own version badge on microbadger.com") +[![Build Status](https://travis-ci.org/rtucek/nginx-php.svg?branch=master)](https://travis-ci.org/rtucek/nginx-php) [![](https://images.microbadger.com/badges/image/rtucek/nginx-php.svg)](https://microbadger.com/images/rtucek/nginx-php "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php.svg)](https://microbadger.com/images/rtucek/nginx-php "Get your own version badge on microbadger.com") ## nginx-php Dockerfile From a7001d2306f4b5059d299c2558f428604cb19b1b Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 6 Jan 2017 09:33:49 +0100 Subject: [PATCH 2/3] Rename image name --- Makefile | 4 ++-- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2fc046c..726f477 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -REPO = janus1990 -IMAGE = docker-nginx-php +REPO = rtucek +IMAGE = nginx-php VERSION = 0.3.0 EXTRAVERSION = diff --git a/README.md b/README.md index 0bf346f..c5a0304 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## nginx-php Dockerfile -This repository contains source code of [janus1990/docker-nginx-php](https://hub.docker.com/r/janus1990/docker-nginx-php/). +This repository contains source code of [rtucek/nginx-php](https://hub.docker.com/r/rtucek/nginx-php). ## Content @@ -22,10 +22,10 @@ automatically, you may want to use ## Usage ```bash -docker run -v /path/to/php/source/:/usr/local/nginx/html/ janus1990/docker-nginx-php +docker run -v /path/to/php/source/:/usr/local/nginx/html/ rtucek/nginx-php # With restart policy -docker run --restart=always -v /path/to/php/source/:/usr/local/nginx/html/ janus1990/docker-nginx-php +docker run --restart=always -v /path/to/php/source/:/usr/local/nginx/html/ rtucek/nginx-php ``` ## Advanced configuration @@ -37,7 +37,7 @@ PHP related configuration files. Mount your custom `nginx.conf` file at `/usr/local/nginx/conf/nginx.conf`. -`docker run -v /path/to/nginx.conf:/usr/local/nginx/conf/nginx.conf ... janus1990/docker-nginx-php` +`docker run -v /path/to/nginx.conf:/usr/local/nginx/conf/nginx.conf ... rtucek/nginx-php` ### PHP & PHP-FPM From 72c9cb48aaf105e96bdea7f33a9a8e37e2fdb0d9 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 6 Jan 2017 09:34:46 +0100 Subject: [PATCH 3/3] Update changelog for release v0.3.1 --- CHANGELOG.md | 5 ++++- Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b19077..ba469d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -##### Tag v0.3.0 (2016-12-31) +##### Tag v0.3.1 (2017-XX-XX) + +- Rename image +- Update badges ##### Tag v0.3.0 (2016-12-31) [![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.3.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.3.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.0 "Get your own version badge on microbadger.com") diff --git a/Makefile b/Makefile index 726f477..1af9c5a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ REPO = rtucek IMAGE = nginx-php -VERSION = 0.3.0 +VERSION = 0.3.1 EXTRAVERSION = IMAGE_FQN = $(REPO)/$(IMAGE):v$(VERSION)$(EXTRAVERSION)