From 79a8350451b8bb05c3b27a64431f2f8d8cdfa7c4 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 30 Dec 2016 21:24:29 +0100 Subject: [PATCH 1/4] Bump up Nginx to v1.11.8 See https://nginx.org/en/CHANGES --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b8ae91..261a160 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:jessie ENV \ - NGINX_VERSION=1.11.7 \ + NGINX_VERSION=1.11.8 \ PHP_VERSION=7.1.0 COPY \ From 0de0f677ebcee66a2336b33ed51790f210e5510f Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Sat, 31 Dec 2016 08:25:39 +0100 Subject: [PATCH 2/4] Remove misleading comments --- README.md | 1 - docker-entrypoint | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index e3d5893..c524bcf 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,3 @@ If you want to overwrite the default Honcho configuration - mount your custom `P ## Todo - Add [HEALTHCHECK](https://docs.docker.com/engine/reference/builder/#/healthcheck) -- Add more support for composer in docker entrypoint. diff --git a/docker-entrypoint b/docker-entrypoint index 6345db0..a75ccf7 100644 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -8,7 +8,6 @@ # chown www-data:www-data /usr/local/nginx/logs/error-php.log # Update PHP composer -# Update PHP composer to most most recent version (as of now the current version is v1.2.2). # By default, we will try to update to the most recent version of PHP composer. # However, this blocks starting the initial process IF you have a bad or no Internet connection at # all. To avoid this, you can start the container with SKIP_COMPOSER_UPDATE env set to 1. From 43f139cb953aceb44bb7760dcf706a3b8cd178ca Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Sat, 31 Dec 2016 08:43:27 +0100 Subject: [PATCH 3/4] Add badges and make headings smaller --- CHANGELOG.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8743e28..8c2c9f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,23 @@ -## Tag v0.2.0 (2016-12-25) +##### 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") - Upgrade to PHP v7.1.0 - Add badges to README.md (powered by microbadger.com). -## TAG v0.1.2 (2016-19-12) +##### 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") + - Fix PHP composer installer. -## TAG v0.1.1 (2016-18-12) +##### TAG v0.1.1 (2016-18-12) - 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) +##### 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") Initial release - Compile Nginx v1.11.6 from source. @@ -21,7 +25,8 @@ Initial release - Install most recent version of PHP composer (as of 2016-12-01 v1.2.2). - Install Honcho for process monitoring. -## TAG v0.1.0-RC1 (2016-12-01) +##### 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") Initial release - Compile Nginx v1.11.6 from source. From 0dd68bf37e6d61bebc9ab37e9da676702b18e0d6 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Sat, 31 Dec 2016 09:03:20 +0100 Subject: [PATCH 4/4] Add release notes --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c2c9f2..e8aeea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +##### Tag v0.2.1 (2016-12-31) + +- 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")