Release v17.09-rc12

khs1994 · web-flow · commit b714e75d1ea7 · 2017-10-13T20:12:00.000+08:00
Release v17.09-rc12 (#24)
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-KHS1994_LNMP_DOCKER_VERSION=v17.09-rc11
+KHS1994_LNMP_DOCKER_VERSION=v17.09-rc12
 
 # Docker Compose VAR
 
diff --git a/Changelog.md b/Changelog.md
@@ -5,6 +5,14 @@ Changelog
 
 #### v17.12 rc1
 
+#### v17.09 rc12
+
+Bug fixes:
+* Fix `./lnmp-docker.sh` CLI
+
+Updates:
+* Update Support Documents
+
 #### v17.09 rc11
 
 Changes:
diff --git a/README.cn.md b/README.cn.md
@@ -77,16 +77,16 @@ $ docker-compose down
 
 |Name|Docker Image|Version|Based|
 |:-- |:--         |:--    |:--  |
-|[NGINX](https://github.com/khs1994-docker/nginx)         |khs1994/nginx:1.13.5-alpine    |`1.13.6` |Alpine:3.5|
+|[NGINX](https://github.com/khs1994-docker/nginx)         |khs1994/nginx:1.13.6-alpine    |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/nginx.svg)](https://github.com/khs1994-docker/nginx/releases) |Alpine:3.5|
 |MySQL                                                    |mysql:5.7.19                   |`5.7.19` |Debian:jessie|
-|[Redis](https://github.com/khs1994-docker/redis)         |khs1994/redis:4.0.2-alpine     |`4.0.2`  |Alpine:3.6|
-|[PHP-FPM](https://github.com/khs1994-docker/php-fpm)     |khs1994/php-fpm:7.1.10-alpine  |`7.1.10` |Alpine:3.4|
+|[Redis](https://github.com/khs1994-docker/redis)         |khs1994/redis:4.0.2-alpine     |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/redis.svg)](https://github.com/khs1994-docker/redis/releases)   |Alpine:3.6|
+|[PHP-FPM](https://github.com/khs1994-docker/php-fpm)     |khs1994/php-fpm:7.1.10-alpine  |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/php-fpm.svg)](https://github.com/khs1994-docker/php-fpm/releases)  |Alpine:3.4|
 |Laravel                                                  |khs1994/php-fpm:7.1.10-alpine  |`5.5`    |Alpine:3.4|
 |Composer                                                 |khs1994/php-fpm:7.1.10-alpine  |`1.5.2`  |Alpine:3.4|
-|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.2-alpine |`1.5.2`  |Alpine:3.6|
-|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq)   |khs1994/rabbitmq:3.6.12-alpine |`3.6.12` |Alpine:3.5|
-|[PostgreSQL](https://github.com/khs1994-docker/postgres) |khs1994/postgres:10.0-alpine   |`10.0`   |Alpine:3.6|
-|MongoDB                                                  |mongo:3.5.13                   |`3.5.13` |Debian:jessie|
+|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.2-alpine |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/memcached.svg)](https://github.com/khs1994-docker/memcached/releases)   |Alpine:3.6|
+|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq)   |khs1994/rabbitmq:3.6.12-alpine |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/rabbitmq.svg)](https://github.com/khs1994-docker/rabbitmq/releases)  |Alpine:3.5|
+|[PostgreSQL](https://github.com/khs1994-docker/postgres) |khs1994/postgres:10.0-alpine   |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/postgres.svg)](https://github.com/khs1994-docker/postgres/releases)    |Alpine:3.6|
+|MongoDB                                                  |mongo:3.5.13                   |`3.5.13`|Debian:jessie|
 |Gogs                                                     |gogs/gogs:latest               |`latest` |Alpine:3.5|
 
 ## 文件夹结构
diff --git a/README.md b/README.md
@@ -74,16 +74,16 @@ LNMP Docker is supported on Linux, macOS, Windows 10 (PC) on `x86_64`,and Debian
 
 |Name|Docker Image|Version|Based|
 |:-- |:--         |:--    |:--  |
-|[NGINX](https://github.com/khs1994-docker/nginx)         |khs1994/nginx:1.13.5-alpine    |`1.13.6` |Alpine:3.5|
+|[NGINX](https://github.com/khs1994-docker/nginx)         |khs1994/nginx:1.13.6-alpine    |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/nginx.svg)](https://github.com/khs1994-docker/nginx/releases) |Alpine:3.5|
 |MySQL                                                    |mysql:5.7.19                   |`5.7.19` |Debian:jessie|
-|[Redis](https://github.com/khs1994-docker/redis)         |khs1994/redis:4.0.2-alpine     |`4.0.2`  |Alpine:3.6|
-|[PHP-FPM](https://github.com/khs1994-docker/php-fpm)     |khs1994/php-fpm:7.1.10-alpine  |`7.1.10` |Alpine:3.4|
+|[Redis](https://github.com/khs1994-docker/redis)         |khs1994/redis:4.0.2-alpine     |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/redis.svg)](https://github.com/khs1994-docker/redis/releases)   |Alpine:3.6|
+|[PHP-FPM](https://github.com/khs1994-docker/php-fpm)     |khs1994/php-fpm:7.1.10-alpine  |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/php-fpm.svg)](https://github.com/khs1994-docker/php-fpm/releases)  |Alpine:3.4|
 |Laravel                                                  |khs1994/php-fpm:7.1.10-alpine  |`5.5`    |Alpine:3.4|
 |Composer                                                 |khs1994/php-fpm:7.1.10-alpine  |`1.5.2`  |Alpine:3.4|
-|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.2-alpine |`1.5.2`  |Alpine:3.6|
-|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq)   |khs1994/rabbitmq:3.6.12-alpine |`3.6.12` |Alpine:3.5|
-|[PostgreSQL](https://github.com/khs1994-docker/postgres) |khs1994/postgres:10.0-alpine   |`10.0`   |Alpine:3.6|
-|MongoDB                                                  |mongo:3.5.13                   |`3.5.13` |Debian:jessie|
+|[Memcached](https://github.com/khs1994-docker/memcached) |khs1994/memcached:1.5.2-alpine |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/memcached.svg)](https://github.com/khs1994-docker/memcached/releases)   |Alpine:3.6|
+|[RabbitMQ](https://github.com/khs1994-docker/rabbitmq)   |khs1994/rabbitmq:3.6.12-alpine |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/rabbitmq.svg)](https://github.com/khs1994-docker/rabbitmq/releases)  |Alpine:3.5|
+|[PostgreSQL](https://github.com/khs1994-docker/postgres) |khs1994/postgres:10.0-alpine   |[![GitHub release](https://img.shields.io/github/release/khs1994-docker/postgres.svg)](https://github.com/khs1994-docker/postgres/releases)    |Alpine:3.6|
+|MongoDB                                                  |mongo:3.5.13                   |`3.5.13`|Debian:jessie|
 |Gogs                                                     |gogs/gogs:latest               |`latest` |Alpine:3.5|
 
 ## Folder Structure
diff --git a/app/README.md b/app/README.md
@@ -1 +1 @@
-# LNMP Docker 示例项目文件
+# PHP 项目文件
diff --git a/backup/README.md b/backup/README.md
@@ -0,0 +1 @@
+# 数据备份文件夹
diff --git a/ci/.gitignore b/ci/.gitignore
@@ -2,3 +2,4 @@ node_modules
 .env
 update.js
 update.sh
+package-lock.json
diff --git a/ci/README.md b/ci/README.md
@@ -1,13 +1,17 @@
 # CI/CD
 
+## 初始化
+
 ```bash
 $ ./init.sh
 ```
 
+## 配置
+
 在 `.env` 配置端口
 
 在 `update.js` 配置 secret
 
-在 `update.sj` 配置执行脚本
+在 `update.sh` 配置执行脚本
 
 Powered By [github-webhook-handler](https://github.com/rvagg/github-webhook-handler)
diff --git a/ci/package-lock.json b/ci/package-lock.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -78,18 +78,18 @@ services:
   #   #   - "27017"
   #   command: ["mongod","--config","/etc/mongod.conf"]
   #
-
-  gogs:
-    image: gogs/gogs:${KHS1994_LNMP_GOGS_VERSION}
-    ports:
-      - "22:22"
-    networks:
-      - frontend
-      - backend
-    volumes:
-      - gogs-data:/data:rw
-      - ./config/gogs/app.prod.ini:/data/gogs/conf/app.ini:ro
-      - ./config/nginx/ssl:/data/ssl:ro
+  #
+  # gogs:
+  #   image: gogs/gogs:${KHS1994_LNMP_GOGS_VERSION}
+  #   ports:
+  #     - "22:22"
+  #   networks:
+  #     - frontend
+  #     - backend
+  #   volumes:
+  #     - gogs-data:/data:rw
+  #     - ./config/gogs/app.prod.ini:/data/gogs/conf/app.ini:ro
+  #     - ./config/nginx/ssl:/data/ssl:ro
 
   php7:
     restart: always
@@ -154,9 +154,9 @@ networks:
 
 volumes:
   mysql-data:
-  #pg-data:
-  #mongodb-data:
+  # pg-data:
+  # mongodb-data:
   redis-data:
-  #rabbitmq-data:
-  #postgresql-data:
-  gogs-data:
+  # rabbitmq-data:
+  # postgresql-data:
+  # gogs-data:
diff --git a/docs/README.md b/docs/README.md
@@ -5,10 +5,10 @@
 
 * [项目初衷](why.md)
 
-* [国内网络问题](cn.md)
-
 * [项目初始化过程](init.md)
 
+* [国内网络问题](cn.md)
+
 * [路径说明](path.md)
 
 * [开发环境 && 构建镜像](development.md)
@@ -35,7 +35,7 @@
 
 * [备份 && 恢复](backup.md)
 
-* [测试脚本](test.md)
+* [清理](cleanup.md)
 
 * [Windows 10](windows.md)
 
diff --git a/docs/cleanup.md b/docs/cleanup.md
@@ -0,0 +1,3 @@
+# 清理
+
+将日志文件内容清空
diff --git a/docs/cli.md b/docs/cli.md
@@ -1,14 +1,14 @@
 # 命令行工具简要说明
 
-只适用于 Linux、macOS，为避免输入过多的命令，编写了命令行工具简化用户使用，提供了以下功能：
+只适用于 `Linux`、`macOS`，为避免输入过多的命令，编写了命令行工具简化用户使用，提供了以下功能：
 
 * 各种场景和架构中一键启动
 
-* 安装 Laravel 项目
+* 安装 `Laravel` 项目
 
-* 使用 Laravel artisan
+* 使用 `Laravel artisan`
 
-* 使用 Composer
+* 使用 `Composer`
 
 * 命令行执行 PHP 文件
 
diff --git a/docs/init.md b/docs/init.md
@@ -1,11 +1,13 @@
 # 初始化
 
-如果是开发环境，拉取 git 子模块
+是否安装 `docker-compose`
+
+如果是 `开发环境`，拉取 git 子模块
 
 ```bash
 $ git submodule update --init --recursive
 ```
 
-是否安装 docker-compose，国内用户请首先执行 `./lnmp-docker.sh compose`
+如果是 `生产环境`，载入项目文件、nginx 配置文件
 
 建立日志文件夹和空白日志文件
diff --git a/docs/nginx-with-https.md b/docs/nginx-with-https.md
@@ -2,7 +2,7 @@
 
 nginx 主配置文件位于 `./config/etc/nginx/nginx.conf`，子配置文件位于 `./config/nginx/`
 
-主要注意的是 `[文件路径](path.md)` 问题。下面以 https 配置为例进行讲解。
+主要注意的是 `[文件路径](path.md)` 问题。下面以 `https` 配置为例进行讲解。
 
 ```nginx
 server{
diff --git a/docs/path.md b/docs/path.md
@@ -34,7 +34,7 @@
 |名称|本机|容器|
 |--|--|--|
 |`redis.conf`|`./config/redis/redis.conf`|`/usr/local/etc/redis/redis.conf`|
-|`/data/`    |`./var/lib/redis`          |`/data`                          |
+|`/data/`    |`redis-data`               |`/data`                          |
 
 # 数据库
 
@@ -43,18 +43,26 @@
 |名称|本机|容器|
 |--|--|--|
 |`error.log`      |`./logs/mysql/error.log`|`/var/log/mysql/error.log`|
-|`/var/lib/mysql/`|`./var/lib/mysql`       |`/var/lib/mysql`|
+|`/var/lib/mysql/`|`mysql-data`            |`/var/lib/mysql`|
 
 ## PostgreSQL
 
 |名称|本机|容器|
 |--|--|--|
-|`/var/lib/postgresql/`|`./var/lib/postgresql`|`/var/lib/postgresql`|
+|`/var/lib/postgresql/`|`postgresql-data`|`/var/lib/postgresql`|
 
 ## MongoDB
 
 |名称|本机|容器|
 |--|--|--|
-|`/data/db/`  |`./var/lib/mongo`              |`/data/db/`                 |
+|`/data/db/`  |`mongodb-data`                 |`/data/db/`                 |
 |`mongod.conf`|`./config/mongodb/mongod.conf` |`/etc/mongod.conf`          |
 |`mongo.log`  |`./logs/mongodb/mongo.log`     |`/var/log/mongodb/mongo.log`|
+
+# Gogs
+
+|名称|本机|容器|
+|--|--|--|
+|`app.ini`|`./config/gogs/app.prod.ini`|`/data/gogs/conf/app.ini`|
+|`ssl`    |`./config/nginx/ssl`        |`/data/ssl`|
+|`data`   |`gogs-data`                 |`/data`|
diff --git a/docs/production.md b/docs/production.md
@@ -16,12 +16,12 @@
 
 # 裸机配置
 
-安装 Docker
+安装 `Docker`
 
-配置 Docker 加速器
+配置 `Docker 加速器`
 
-安装 docker-compose
+安装 `docker-compose`
 
-自定义 `./bin/production-init`，拉取项目文件、nginx 配置文件
+自定义 `./bin/production-init`，拉取 `项目文件`、`nginx 配置文件`
 
 执行 `./lnmp-docker.sh production`
diff --git a/lnmp-docker.sh b/lnmp-docker.sh
diff --git a/logs/README.md b/logs/README.md
diff --git a/tmp/README.md b/tmp/README.md

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-KHS1994_LNMP_DOCKER_VERSION=v17.09-rc11`
	`1`	`+KHS1994_LNMP_DOCKER_VERSION=v17.09-rc12`
`2`	`2`
`3`	`3`	`# Docker Compose VAR`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# LNMP Docker 示例项目文件`
	`1`	`+# PHP 项目文件`