Skip to content

Commit 9bf5bcc

Browse files
authored
Merge pull request #6 from rtucek/release/v0.2.1
Release/v0.2.1
2 parents f9fcc14 + 0dd68bf commit 9bf5bcc

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

CHANGELOG.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,38 @@
1-
## Tag v0.2.0 (2016-12-25)
1+
##### Tag v0.2.1 (2016-12-31)
2+
3+
- Remove misleading comments - #3
4+
- Add badges and make headings smaller - #4
5+
- Bump up Nginx to v1.11.8 - #5
6+
7+
##### Tag v0.2.0 (2016-12-25)
8+
[![](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")
29

310
- Upgrade to PHP v7.1.0
411
- Add badges to README.md (powered by microbadger.com).
512

6-
## TAG v0.1.2 (2016-19-12)
13+
##### TAG v0.1.2 (2016-19-12)
14+
[![](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")
15+
716

817
- Fix PHP composer installer.
918

10-
## TAG v0.1.1 (2016-18-12)
19+
##### TAG v0.1.1 (2016-18-12)
1120

1221
- Update Nginx to v1.11.7.
1322
- Update PHP to v7.0.14.
1423
- Fix permission on mounted volumes (see commit `9568fc3`).
1524

16-
## TAG v0.1.0 (2016-12-16)
25+
##### TAG v0.1.0 (2016-12-16)
26+
[![](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")
1727

1828
Initial release
1929
- Compile Nginx v1.11.6 from source.
2030
- Compile PHP with PHP-FPM v7.0.13 from source.
2131
- Install most recent version of PHP composer (as of 2016-12-01 v1.2.2).
2232
- Install Honcho for process monitoring.
2333

24-
## TAG v0.1.0-RC1 (2016-12-01)
34+
##### TAG v0.1.0-RC1 (2016-12-01)
35+
[![](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")
2536

2637
Initial release
2738
- Compile Nginx v1.11.6 from source.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM debian:jessie
22

33
ENV \
4-
NGINX_VERSION=1.11.7 \
4+
NGINX_VERSION=1.11.8 \
55
PHP_VERSION=7.1.0
66

77
COPY \

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@ If you want to overwrite the default Honcho configuration - mount your custom `P
4949
## Todo
5050

5151
- Add [HEALTHCHECK](https://docs.docker.com/engine/reference/builder/#/healthcheck)
52-
- Add more support for composer in docker entrypoint.

docker-entrypoint

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# chown www-data:www-data /usr/local/nginx/logs/error-php.log
99

1010
# Update PHP composer
11-
# Update PHP composer to most most recent version (as of now the current version is v1.2.2).
1211
# By default, we will try to update to the most recent version of PHP composer.
1312
# However, this blocks starting the initial process IF you have a bad or no Internet connection at
1413
# all. To avoid this, you can start the container with SKIP_COMPOSER_UPDATE env set to 1.

0 commit comments

Comments
 (0)