Skip to content

Commit 0b3c34c

Browse files
committed
Merge branch 'documentation'
* documentation: Change format of CHANGELOG and extend README
2 parents 9ed914f + a3344f5 commit 0b3c34c

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

CHANGELOG.md

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

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

README.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,28 @@ docker run -v /path/to/php/source/:/usr/local/nginx/html/ janus1990/docker-nginx
2323
docker run --restart=always -v /path/to/php/source/:/usr/local/nginx/html/ janus1990/docker-nginx-php
2424
```
2525

26+
## Advanced configuration
27+
28+
You by default, the image is configured to work out of the box, however you may add your own Nginx or
29+
PHP related configuration files.
30+
31+
### Nginx
32+
33+
Mount your custom `nginx.conf` file at `/usr/local/nginx/conf/nginx.conf`.
34+
35+
`docker run -v /path/to/nginx.conf:/usr/local/nginx/conf/nginx.conf ... janus1990/docker-nginx-php`
36+
37+
### PHP & PHP-FPM
38+
39+
* Mount your custom `php-fpm.conf` file at `/usr/local/etc/php-fpm.conf`.
40+
* Mount your custom `www.conf` file at `/usr/local/etc/www.conf`.
41+
* Mount your custom `php.ini` file at `/usr/local/php/php.ini`.
42+
43+
### Honcho
44+
45+
If you want to overwrite the default Honcho configuration - mount your custom `Procfile` file at `/`.
46+
2647
## Todo
2748

2849
- Add [HEALTHCHECK](https://docs.docker.com/engine/reference/builder/#/healthcheck)
29-
- Extend [README.md](./README.md) with configuration (Procfile, nginx.conf...).
3050
- Add more support for composer in docker entrypoint.

0 commit comments

Comments
 (0)