Merge branch 'master' of https://github.com/yeszao/dnmp

yeszao · Oct 14, 2019 · 1ca8779 · 1ca8779
2 parents 60381bf + c1b9d01
commit 1ca8779
Show file tree

Hide file tree

Showing 56 changed files with 3,840 additions and 865 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,4 @@
-log/
-mysql/
+logs/
+data/
 www/
-conf/conf.d/certs/
+services/nginx/ssl/
diff --git a/.gitattributes b/.gitattributes
@@ -2,4 +2,6 @@
 
 *.png binary
 *.jpg binary
-*.tgz binary
+*.tgz binary
+*.zip binary
+*.gz binary
diff --git a/Dockerfile b/Dockerfile
diff --git a/README-en.md b/README-en.md
@@ -2,11 +2,10 @@ Docker deploying Nginx MySQL PHP7/PHP5.6/PHP5.4 in one key, support full feature
 
 **[[中文说明]](README.md)**
 
-![Demo Image](./dnmp.png)
 
 ## 1. Feature
 1. Completely open source.
-2. Support Multiple PHP version(~~PHP5.4,~~ PHP5.6, PHP7.2) switch.
+2. Support Multiple PHP version(PHP5.4, PHP5.6, PHP7.0, PHP7.1, PHP7.2, PHP7.3) switch.
 3. Support Multiple domains.
 4. Support HTTPS and HTTP/2.
 5. PHP source located in host.
@@ -43,17 +42,17 @@ The index file is located at `./www/localhost/index.php`.
 
 
 ## 3.Multiple php version
-Default, we create 3 php container, they are PHP7.2, PHP5.6 and PHP5.4,
+Default, we create 3 php container, they are PHP7, PHP5.6 and PHP5.4,
 
 We can change easy by modify Nginx configuration `fastcgi_pass`.
 
-For example, [http://localhost](http://localhost) use PHP5.4, Nginx `fastcgi_pass` is:
+For example, [http://localhost](http://localhost) use PHP7, Nginx `fastcgi_pass` is:
 ```
-    fastcgi_pass   php54:9000;
+    fastcgi_pass   php:9000;
 ```
-To use PHP7.2, change it:
+To use PHP7, change it:
 ```
-    fastcgi_pass   php72:9000;
+    fastcgi_pass   php54:9000;
 ```
 Then reload nginx:
 ```bash