Merge branch '18.06'

Signed-off-by: khs1994 <khs1994@khs1994.com>

.editorconfig

@@ -6,6 +6,8 @@ root = true
 
 indent_style = space
 
+indent_size = 2
+
 charset = utf-8
 
 trim_trailing_whitespace = true
@@ -26,6 +28,10 @@ indent_size = 4
 
 indent_size = 4
 
+[*.{go,java}]
+
+indent_size = 4
+
 [*.xml]
 
 indent_size = 4
@@ -34,10 +40,6 @@ indent_size = 4
 
 indent_style = tab
 
-[{package.json,.travis.yml,.khsci.yml,.drone.yml}]
-
-indent_size = 2
-
-[*.js]
+[{package.json,.travis.yml,.pcit.yml,.drone.yml}]
 
 indent_size = 2

.env.example

@@ -104,11 +104,11 @@ LNMP_REGISTRY_HOST=docker.t.khs1994.com
 
 # Soft Version
 
-LNMP_NGINX_VERSION=1.15.3
+LNMP_NGINX_VERSION=1.15.4
 
-LNMP_NGINX_UNIT_VERSION=1.3
+LNMP_NGINX_UNIT_VERSION=1.4
 
-LNMP_HTTPD_VERSION=2.4.34
+LNMP_HTTPD_VERSION=2.4.35
 
 LNMP_MYSQL_VERSION=8.0.12
 
@@ -120,7 +120,7 @@ LNMP_PHP_VERSION=7.2.10
 
 LNMP_MEMCACHED_VERSION=1.5.10
 
-LNMP_RABBITMQ_VERSION=3.7.6
+LNMP_RABBITMQ_VERSION=3.7.8
 
 LNMP_POSTGRESQL_VERSION=10.4
 

.env.example.ps1

@@ -39,13 +39,13 @@ $DistributionName="debian"
 
 $COMMON_SOFT="nginx","php","mysql","wsl-redis"
 
-$global:NGINX_VERSION="1.15.3"
+$global:NGINX_VERSION="1.15.4"
 # https://windows.php.net/download/
 $global:PHP_VERSION="7.2.10"
 $global:MYSQL_VERSION="8.0.12"
-$global:HTTPD_VERSION="2.4.34"
+$global:HTTPD_VERSION="2.4.35"
 $global:IDEA_VERSION="1.11.4269"
-$global:NODE_VERSION="10.10.0"
+$global:NODE_VERSION="10.11.0"
 $global:GIT_VERSION="2.19.0"
 $global:PYTHON_VERSION="3.7.0"
 $global:GOLANG_VERSION="1.11"

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -11,7 +11,7 @@ about: Create a report to help us improve
 ```bash
 $ cd lnmp
 
-$ ./lnmp-docker.sh debug
+$ ./lnmp-docker debug
 ```
 
 复制 `lnmp/debug.md` 内容到这里，并贴出终端执行内容及问题

README.cn.md

@@ -188,9 +188,9 @@ $ ./lnmp-docker down
 |Name|Docker Image|Version|Based|
 |:-- |:--         |:--    |:--  |
 |[ACME.sh](https://github.com/Neilpang/acme.sh)                            |`khs1994/acme:2.7.9`        | **2.7.9**              |`Alpine:3.8`    |
-|[NGINX](https://github.com/khs1994-website/tls-1.3)                       |`khs1994/nginx:1.15.3-alpine`| **1.15.3**             |`Alpine:3.8`    |
+|[NGINX](https://github.com/khs1994-website/tls-1.3)                       |`khs1994/nginx:1.15.4-alpine`| **1.15.4**             |`Alpine:3.8`    |
 |[NGINX Unit](https://github.com/nginx/unit)                       |`khs1994/nginx-unit:1.3-alpine`| **1.3**             |`Alpine:3.8`    |
-|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.34-alpine`       | **2.4.34**             |`Alpine:3.7`    |
+|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.35-alpine`       | **2.4.35**             |`Alpine:3.7`    |
 |[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.12`              | **8.0.12**             |`Debian:stretch`|
 |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.3.9`            | **10.3.9**             |`Ubuntu:bionic` |
 |[Redis](https://github.com/docker-library/docs/tree/master/redis)         |`redis:5.0-rc5-alpine`        | **5.0-rc5**            |`Alpine:3.8`    |
@@ -199,7 +199,7 @@ $ ./lnmp-docker down
 |[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php:7.2.10-fpm-alpine`  | **1.7.2**       |`Alpine:3.8`    |
 |[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)              |`khs1994/php:7.2.10-fpm-alpine`  | **2.13.0**      |`Alpine:3.8`    |
 |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.10-alpine`           | **1.5.10**       |`Alpine:3.8`    |
-|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.7.6-management-alpine` | **3.7.6**       |`Alpine:3.8`    |
+|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.7.8-management-alpine` | **3.7.8**       |`Alpine:3.8`    |
 |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:10.4-alpine`             | **10.4**        |`Alpine:3.8`    |
 |[MongoDB](https://github.com/docker-library/docs/tree/master/mongo)       |`mongo:4.1.2`                      | **4.1.2**       |`Ubuntu:xenial` |
 |[PHPMyAdmin](https://github.com/phpmyadmin/docker)                        | `phpmyadmin/phpmyadmin:latest`    | **latest**      |`Alpine:3.8`    |

README.md

@@ -183,9 +183,9 @@ Please see [Documents](docs#%E6%BB%A1%E8%B6%B3-lnmp-%E5%BC%80%E5%8F%91%E5%85%A8%
 |Name|Docker Image|Version|Based|
 |:-- |:--         |:--    |:--  |
 |[ACME.sh](https://github.com/Neilpang/acme.sh)                            |`khs1994/acme:2.7.9`        | **2.7.9**              |`Alpine:3.8`    |
-|[NGINX](https://github.com/khs1994-website/tls-1.3)                       |`khs1994/nginx:1.15.3-alpine`| **1.15.3**             |`Alpine:3.8`    |
+|[NGINX](https://github.com/khs1994-website/tls-1.3)                       |`khs1994/nginx:1.15.4-alpine`| **1.15.4**             |`Alpine:3.8`    |
 |[NGINX Unit](https://github.com/nginx/unit)                       |`khs1994/nginx-unit:1.3-alpine`| **1.3**             |`Alpine:3.8`    |
-|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.34-alpine`       | **2.4.34**             |`Alpine:3.7`    |
+|[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.35-alpine`       | **2.4.35**             |`Alpine:3.7`    |
 |[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.12`              | **8.0.12**             |`Debian:stretch`|
 |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.3.9`            | **10.3.9**             |`Ubuntu:bionic` |
 |[Redis](https://github.com/docker-library/docs/tree/master/redis)         |`redis:5.0-rc5-alpine`        | **5.0-rc5**            |`Alpine:3.8`    |
@@ -194,7 +194,7 @@ Please see [Documents](docs#%E6%BB%A1%E8%B6%B3-lnmp-%E5%BC%80%E5%8F%91%E5%85%A8%
 |[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php:7.2.10-fpm-alpine`  | **1.7.2**       |`Alpine:3.8`    |
 |[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)              |`khs1994/php:7.2.10-fpm-alpine`  | **2.13.0**      |`Alpine:3.8`    |
 |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.10-alpine`           | **1.5.10**       |`Alpine:3.8`    |
-|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.7.6-management-alpine` | **3.7.6**       |`Alpine:3.8`    |
+|[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.7.8-management-alpine` | **3.7.8**       |`Alpine:3.8`    |
 |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:10.4-alpine`             | **10.4**        |`Alpine:3.8`    |
 |[MongoDB](https://github.com/docker-library/docs/tree/master/mongo)       |`mongo:4.1.2`                      | **4.1.2**       |`Ubuntu:xenial` |
 |[PHPMyAdmin](https://github.com/phpmyadmin/docker)                        | `phpmyadmin/phpmyadmin:latest`    | **latest**      |`Alpine:3.8`    |

app/demo/.drone.yml

@@ -186,7 +186,7 @@ matrix:
     # - 7.0.32
     # - 5.6.38
   NGINX_VERSION:
-    - 1.15.3
+    - 1.15.4
   REDIS_VERSION:
     - 5.0-rc5-alpine
   MYSQL_VERSION:

app/demo/.editorconfig

@@ -6,6 +6,8 @@ root = true
 
 indent_style = space
 
+indent_size = 2
+
 charset = utf-8
 
 trim_trailing_whitespace = true
@@ -16,28 +18,28 @@ end_of_line = lf
 
 [*.md]
 
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true
+
+[*.py]
+
+indent_size = 4
 
 [*.php]
 
 indent_size = 4
 
-[*.xml]
+[*.{go,java}]
 
 indent_size = 4
 
-[*.py]
+[*.xml]
 
 indent_size = 4
 
 [Makefile]
 
 indent_style = tab
 
-[{package.json,.travis.yml,.khsci.yml,.drone.yml}]
-
-indent_size = 2
-
-[*.js]
+[{package.json,.travis.yml,.pcit.yml,.drone.yml}]
 
 indent_size = 2

app/demo/.gitattributes.example

@@ -6,10 +6,13 @@
 /tests               export-ignore
 /.dockerignore       export-ignore
 /.drone.yml          export-ignore
+/.editorconfig       export-ignore
 /.gitattributes      export-ignore
 /.gitignore          export-ignore
 /.gitmodules         export-ignore
+/.php_cs             export-ignore
 /.sami.php           export-ignore
+/.styleci.yml        export-ignore
 /.travis.yml         export-ignore
 .travis.yml          export-ignore
 /CHANGELOG.md        export-ignore

app/demo/.gitignore

@@ -19,8 +19,8 @@ __pycache__
 
 # Sami
 
-build
-cache
+/build
+/cache
 
 # coerage report
 

app/demo/.khsci.yml → app/demo/.pcit.yml

@@ -2,6 +2,12 @@
 # @see https://github.com/khs1994-php/khsci/blob/master/docs/SUMMARY.md
 #
 
+languages: php
+
+# cache:
+#   directories:
+#   - cache
+
 workspace:
   base: /app
   # path: .
@@ -72,7 +78,7 @@ pipeline:
       event: tag
 
   after_success:
-    image: bash
+    image: khs1994/php:${PHP_VERSION}-fpm-alpine
     shell: bash
     when:
       status: success
@@ -110,7 +116,7 @@ services:
   #     - POSTGRES_DB=test
 
   redis:
-    image: redis:${REDIS_VERSION}
+    image: redis:${REDIS_VERSION}-alpine
     command: ["--bind", "0.0.0.0"]
 
   # mongodb:
@@ -126,9 +132,9 @@ matrix:
     # - 7.0.32
     # - 5.6.38
   NGINX_VERSION:
-    - 1.15.3
+    - 1.15.4
   REDIS_VERSION:
-    - 5.0-rc5-alpine
+    - 5.0-rc5
   MYSQL_VERSION:
     # - 8.0.11
     - 5.7.22
@@ -140,13 +146,3 @@ matrix:
 # branches:
 #   include: [ master, dev, feature/* ]
 #   exclude: [ release/1.0.0, release/1.1.* ]
-
-config:
-  aliyun:
-    docker_registry:
-      # registry: git_repo_full_name
-      khs1994/wsl: khs1994-php/khsci
-
-  tencent_cloud:
-    docker_registry:
-      khs1994/wsl: khs1994-php/khsci

app/demo/.travis.yml

@@ -6,13 +6,22 @@
 #
 
 language: php
+
 # cache:
 #   directories:
 #   - cache
 
 dist: xenial #16.04
 # dist: trusty # 14.04
 
+# addons:
+#   apt:
+#     sources:
+#       - mysql-5.7-trusty
+#     packages:
+#       - mysql-server
+#       - mysql-client
+
 sudo: required
 # services:
 # - docker
@@ -63,8 +72,11 @@ before_install:
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS tests_tmp;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE tests_tmp;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS tests_tmp; CREATE DATABASE IF NOT EXISTS tests;'; fi"
   - sh -c "if [ '$ENABLE_MONGODB' = 'enable' ]; then mongo mydb_test --eval 'db.createUser({user:"travis",pwd:"test",roles:["readWrite"]});'; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS tests_tmp; CREATE DATABASE IF NOT EXISTS tests;'; fi"
+  - if [ "$DB" = 'mysql' ]; then sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('new_password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"; fi
+  - if [ "$DB" = 'mysql' ]; then sudo mysql_upgrade -u root -pnew_password; fi
+  - if [ "$DB" = 'mysql' ]; then sudo service mysql restart; fi
   - php .khsci.php
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 

app/demo/docker-compose.yml

@@ -35,9 +35,9 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        - NGINX_VERSION=${NGINX_VERSION:-1.15.3}-alpine
+        - NGINX_VERSION=${NGINX_VERSION:-1.15.4}-alpine
       target: nginx
-    image: khs1994/nginx:${NGINX_VERSION:-1.15.3}-swarm-alpine
+    image: khs1994/nginx:${NGINX_VERSION:-1.15.4}-swarm-alpine
     depends_on:
       - 7_2_X
       # - 7_1_X

cli/completion/bash/lnmp-docker

@@ -76,4 +76,4 @@ complete -W "acme.sh \
         test \
         cn-mirror \
         compose \
-        nfs" lnmp-docker.sh
+        nfs" lnmp-docker

cli/install.txt

@@ -73,13 +73,13 @@ success(){
 
   cd $LNMP_PATH
   which bash 2>&1 >/dev/null
-  if ! [ $? -eq 0 ];then sed -i "s/bin\/bash/bin\/sh/g" lnmp-docker.sh; fi
+  if ! [ $? -eq 0 ];then sed -i "s/bin\/bash/bin\/sh/g" lnmp-docker; fi
 
   echo "Success please exec
 
 $ cd ${LNMP_PATH}
 "
-exec echo "$ ./lnmp-docker.sh development | production"
+exec echo "$ ./lnmp-docker development | production"
 }
 
 error(){

docker-arm.yml

@@ -127,7 +127,7 @@ services:
     #   << : *default-build
     #   context: ./dockerfile/${ARM_ARCH:-arm64v8}/rabbitmq/
     #   dockerfile: Dockerfile
-    image: "${ARM_ARCH:-arm64v8}/rabbitmq:${LNMP_RABBITMQ_VERSION:-3.7.6}-management${ARM_BASED_OS}"
+    image: "${ARM_ARCH:-arm64v8}/rabbitmq:${LNMP_RABBITMQ_VERSION:-3.7.8}-management${ARM_BASED_OS}"
     volumes:
       - rabbitmq-data:/var/lib/rabbitmq
       - zoneinfo-data:/usr/share/zoneinfo
@@ -217,7 +217,7 @@ services:
     #   context: ./dockerfile/${ARM_ARCH:-arm64v8}/nginx/
     #   dockerfile: Dockerfile
     # image: lnmp-nginx:latest
-    image: "${ARM_ARCH:-arm64v8}/nginx:${LNMP_NGINX_VERSION:-1.15.3}"
+    image: "${ARM_ARCH:-arm64v8}/nginx:${LNMP_NGINX_VERSION:-1.15.4}"
     networks:
       - frontend
     ports:
@@ -241,7 +241,7 @@ services:
     #   context: ./dockerfile/${ARM_ARCH:-arm64v8}/httpd
     #   dockerfile: Dockerfile
     # image: lnmp-httpd:latest
-    image: "${ARM_ARCH:-arm64v8}/httpd:${LNMP_HTTPD_VERSION:-2.4.34}${ARM_BASED_OS}"
+    image: "${ARM_ARCH:-arm64v8}/httpd:${LNMP_HTTPD_VERSION:-2.4.35}${ARM_BASED_OS}"
     ports:
       - "443:443"
       - "80:80"

docker-cluster.nginx.yml

@@ -8,7 +8,7 @@ version: "3.7"
 
 x-common:
   &default-common
-  image: "khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.3}-alpine"
+  image: "khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.4}-alpine"
   restart: always
   env_file: ./cli/timezone.env
   networks:

docker-compose.build.yml

@@ -11,7 +11,7 @@ version: "3.7"
 #
 # $ cd ../../
 #
-# $ ./lnmp-docker.sh build [soft]
+# $ ./lnmp-docker build [soft]
 #
 
 x-build:

docker-compose.override.yml

@@ -50,15 +50,15 @@ services:
 
   nginx:
     << : *default-common
-    image: khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.3}-alpine
+    image: khs1994/nginx:${LNMP_NGINX_VERSION:-1.15.4}-alpine
 
   nginx-unit:
     << : *default-common
-    image: khs1994/nginx-unit:${LNMP_NGINX_UNIT_VERSION:-1.3}-alpine
+    image: khs1994/nginx-unit:${LNMP_NGINX_UNIT_VERSION:-1.4}-alpine
 
   httpd:
     << : *default-common
-    image: httpd:${LNMP_HTTPD_VERSION:-2.4.34}-alpine
+    image: httpd:${LNMP_HTTPD_VERSION:-2.4.35}-alpine
 
 networks:
   frontend: