Skip to content

Commit cb83429

Browse files
authored
Merge pull request #29 from rtucek/fix-changelog-path
Fix changelog path
2 parents ac7dbe4 + d283dc0 commit cb83429

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

README.md

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,26 @@
22

33
## nginx-php Dockerfile
44

5-
This repository contains source code of [rtucek/nginx-php](https://hub.docker.com/r/rtucek/nginx-php).
5+
This repository contains source code of
6+
[rtucek/nginx-php](https://hub.docker.com/r/rtucek/nginx-php).
67

78
## Content
89

9-
Nginx and PHP are compiled in a specific version. Consult the [CHANGELOG.md](./CHANGELOG.md) file
10-
for further version details. [PHP Composer](https://getcomposer.org/) is already installed and ready
11-
for use.
10+
Nginx and PHP are compiled in a specific version. Consult the
11+
[CHANGELOG.md](https://github.com/rtucek/nginx-php/blob/master/CHANGELOG.md)
12+
file for further version details. [PHP Composer](https://getcomposer.org/) is
13+
already installed and ready for use.
1214

13-
Xdebug is installed as shared extension, but not activated. Start the container with env
14-
ENABLE_XDEBUG=1 to enable the extension.
15+
Xdebug is installed as shared extension, but not activated. Start the container
16+
with env ENABLE_XDEBUG=1 to enable the extension.
1517

16-
The Nginx and PHP-FPM master processes are controlled by [Honcho](https://github.com/nickstenning/honcho).
17-
Honcho was chosen over Supervisor, because honcho will exit and kill the container if either Nginx
18-
or PHP's master process dye for any reason. If you want have to have the container restarted
19-
automatically, you may want to use
20-
[Docker's restart](https://docs.docker.com/engine/reference/run/#restart-policies---restart) policy.
18+
The Nginx and PHP-FPM master processes are controlled by
19+
[Honcho](https://github.com/nickstenning/honcho). Honcho was chosen over
20+
Supervisor, because honcho will exit and kill the container if either Nginx or
21+
PHP's master process dye for any reason. If you want have to have the container
22+
restarted automatically, you may want to use
23+
[Docker's restart](https://docs.docker.com/engine/reference/run/#restart-policies---restart)
24+
policy.
2125

2226
## Usage
2327

@@ -30,8 +34,8 @@ docker run --restart=always -v /path/to/php/source/:/usr/local/nginx/html/ rtuce
3034

3135
## Advanced configuration
3236

33-
You by default, the image is configured to work out of the box, however you may add your own Nginx or
34-
PHP related configuration files.
37+
You by default, the image is configured to work out of the box, however you may
38+
add your own Nginx or PHP related configuration files.
3539

3640
### Nginx
3741

@@ -47,9 +51,9 @@ Mount your custom `nginx.conf` file at `/usr/local/nginx/conf/nginx.conf`.
4751

4852
### Xdebug
4953

50-
Xdebug was installed mainly with the idea of providing code coverage for PHPUnit. Thus it's not
51-
configured for any specific use case. You can [configure Xdebug](https://xdebug.org/docs/all) via
52-
`php.ini` if desired.
54+
Xdebug was installed mainly with the idea of providing code coverage for
55+
PHPUnit. Thus it's not configured for any specific use case. You can
56+
[configure Xdebug](https://xdebug.org/docs/all) via `php.ini` if desired.
5357

5458
### Crontab
5559

@@ -65,7 +69,8 @@ whenever possible).
6569

6670
### Honcho
6771

68-
If you want to overwrite the default Honcho configuration - mount your custom `Procfile` file at `/`.
72+
If you want to overwrite the default Honcho configuration - mount your custom
73+
`Procfile` file at `/`.
6974

7075
## Todo
7176

0 commit comments

Comments
 (0)