Skip to content

Commit d2cee80

Browse files
committed
Merge branch 'release/v0.1.0-RC1' into develop
* release/v0.1.0-RC1: Version bump Format CHANGELOG.md and add TODO section in README.md
2 parents eef53e6 + 0abbf70 commit d2cee80

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
TAG NOVERSION (UNRELEASED)
1+
TAG v0.1.0-RC1 (2016-12-01)
22

33
Initial release
4-
Compile Nginx v1.11.6 from source
5-
Compile PHP with PHP-FPM v7.0.13 from source.
6-
Install most recent version of PHP composer (as of 2016-12-01 v1.2.2).
7-
Install Honcho for process monitoring.
4+
- Compile Nginx v1.11.6 from source
5+
- Compile PHP with PHP-FPM v7.0.13 from source.
6+
- Install most recent version of PHP composer (as of 2016-12-01 v1.2.2).
7+
- Install Honcho for process monitoring.

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
REPO = janus1990
22
IMAGE = docker-nginx-php
33
VERSION = 0.1.0
4-
EXTRAVERSION = -dev
4+
EXTRAVERSION = -RC1
55

6-
IMAGE_FQN = $(REPO)/$(IMAGE):$(VERSION)$(EXTRAVERSION)
6+
IMAGE_FQN = $(REPO)/$(IMAGE):v$(VERSION)$(EXTRAVERSION)
77

88
.PHONY: build
99

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,9 @@ docker run -v /path/to/php/source/:/usr/local/nginx/html/ janus1990/docker-nginx
2222
# With restart policy
2323
docker run --restart=always -v /path/to/php/source/:/usr/local/nginx/html/ janus1990/docker-nginx-php
2424
```
25+
26+
## Todo
27+
28+
- Add [HEALTHCHECK](https://docs.docker.com/engine/reference/builder/#/healthcheck)
29+
- Extend [README.md](./README.md) with configuration (Procfile, nginx.conf...).
30+
- Add more support for composer in docker entrypoint.

0 commit comments

Comments
 (0)