Skip to content

Commit 1ca8779

Browse files
committed
Merge branch 'master' of https://github.com/yeszao/dnmp
2 parents 60381bf + c1b9d01 commit 1ca8779

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3840
-865
lines changed

.dockerignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
log/
2-
mysql/
1+
logs/
2+
data/
33
www/
4-
conf/conf.d/certs/
4+
services/nginx/ssl/

.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22

33
*.png binary
44
*.jpg binary
5-
*.tgz binary
5+
*.tgz binary
6+
*.zip binary
7+
*.gz binary

Dockerfile

Lines changed: 0 additions & 34 deletions
This file was deleted.

README-en.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ Docker deploying Nginx MySQL PHP7/PHP5.6/PHP5.4 in one key, support full feature
22

33
**[[中文说明]](README.md)**
44

5-
![Demo Image](./dnmp.png)
65

76
## 1. Feature
87
1. Completely open source.
9-
2. Support Multiple PHP version(~~PHP5.4,~~ PHP5.6, PHP7.2) switch.
8+
2. Support Multiple PHP version(PHP5.4, PHP5.6, PHP7.0, PHP7.1, PHP7.2, PHP7.3) switch.
109
3. Support Multiple domains.
1110
4. Support HTTPS and HTTP/2.
1211
5. PHP source located in host.
@@ -43,17 +42,17 @@ The index file is located at `./www/localhost/index.php`.
4342
4443
4544
## 3.Multiple php version
46-
Default, we create 3 php container, they are PHP7.2, PHP5.6 and PHP5.4,
45+
Default, we create 3 php container, they are PHP7, PHP5.6 and PHP5.4,
4746
4847
We can change easy by modify Nginx configuration `fastcgi_pass`.
4948
50-
For example, [http://localhost](http://localhost) use PHP5.4, Nginx `fastcgi_pass` is:
49+
For example, [http://localhost](http://localhost) use PHP7, Nginx `fastcgi_pass` is:
5150
```
52-
fastcgi_pass php54:9000;
51+
fastcgi_pass php:9000;
5352
```
54-
To use PHP7.2, change it:
53+
To use PHP7, change it:
5554
```
56-
fastcgi_pass php72:9000;
55+
fastcgi_pass php54:9000;
5756
```
5857
Then reload nginx:
5958
```bash

0 commit comments

Comments
 (0)