tag v18.06.05-rc1

Author: khs1994

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Compare
 
-* https://github.com/khs1994-docker/lnmp/compare/v18.06.05...v18.06.04
+* https://github.com/khs1994-docker/lnmp/compare/18.06...v18.06.04
 
 ### Bug fixes:
 

README.cn.md

@@ -69,7 +69,7 @@ $ ./lnmp-docker up
 
 $ curl 127.0.0.1
 
-Welcome use khs1994-docker/lnmp v18.06.04 x86_64 With Pull Docker Image
+Welcome use khs1994-docker/lnmp v18.06.05 x86_64 With Pull Docker Image
 
 development
 

README.md

@@ -67,7 +67,7 @@ $ ./lnmp-docker up
 
 $ curl 127.0.0.1
 
-Welcome use khs1994-docker/lnmp v18.06.04 x86_64 With Pull Docker Image
+Welcome use khs1994-docker/lnmp v18.06.05 x86_64 With Pull Docker Image
 
 development
 

docker-arm.yml

@@ -203,7 +203,7 @@ services:
       - composer_cache-data:/tmp/cache
       - ./dockerfile/php-fpm/docker-php-entrypoint:/usr/local/bin/docker-php-entrypoint
     environment:
-      - LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION:-v18.06.04} ${ARM_ARCH:-arm64v8} With Pull Docker Image
+      - LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION:-v18.06.05} ${ARM_ARCH:-arm64v8} With Pull Docker Image
       - APP_ENV=development
       - XDEBUG_REMOTE_HOST=${XDEBUG_REMOTE_HOST:-192.168.199.100}
     command: ["php-fpm","-R"]

docker-compose.build.yml

@@ -67,7 +67,7 @@ services:
       cache_from:
         - khs1994/php:fpm-alpine
     environment:
-      - LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION:-v18.06.04} x86_64 With Build Docker Image
+      - LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION:-v18.06.05} x86_64 With Build Docker Image
 
   rabbitmq:
     << : *default-labels

docker-compose.yml

@@ -169,7 +169,7 @@ services:
       - "9000"
     command: php-fpm -R -F
     environment:
-      - LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION:-v18.06.04} x86_64 With Pull Docker Image
+      - LNMP_DOCKER_VERSION=${LNMP_DOCKER_VERSION:-v18.06.05} x86_64 With Pull Docker Image
       - APP_ENV=development
       - XDEBUG_REMOTE_HOST=${XDEBUG_REMOTE_HOST:-192.168.199.100}
 

docker-production.yml

@@ -387,7 +387,7 @@ services:
       - backend
     environment:
       - APP_ENV=production
-      - LNMP_DOCKER_VERSION=v18.06.04 x86_64 Docker Swarm
+      - LNMP_DOCKER_VERSION=v18.06.05 x86_64 Docker Swarm
     # logging: *default-logging
     deploy:
       << : *default-deploy

docs/SUMMARY.md

@@ -78,3 +78,7 @@
 ## 测试
 
 * [ab command](ab.md)
+
+## TOOL
+
+* [Git GPG](gpg.md)

docs/gpg.md

@@ -62,14 +62,14 @@ $ gpg --import filename
 
 * https://help.github.com/articles/telling-git-about-your-signing-key/#telling-git-about-your-x509-key
 
-2.19 +
+git 2.19 +
 
 ```bash
 $ git config --global gpg.x509.program smimesign
 $ git config --global gpg.format x509
 ```
 
-2.18 -
+git 2.18 -
 
 ```bash
 $ git config --global gpg.program smimesign

wsl/README.md

@@ -46,7 +46,7 @@ export APP_ENV=wsl
 
 ## 脚本安装软件
 
-如果你不想编译安装，那么我写了一个脚本 （**脚本** 从 Docker 复制编译好的软件 [PHP 最新版] 到 WSL ，或设置 apt 从软件源 [或本人打包的 deb 包] 安装）。
+如果你不想编译安装，那么可以使用脚本（**脚本** 从 Docker 复制编译好的软件 [PHP 最新版] 到 WSL ，或设置 apt 从软件源 [或笔者打包的 deb 包] 安装）。
 
 * https://store.docker.com/community/images/khs1994/wsl/tags