Merge pull request #529 from khs1994-docker/dev

Update Soft Version
khs1994-docker · May 27, 2018 · f5fd6be · f5fd6be
2 parents f32690b + b2f4539
commit f5fd6be
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/.env.example b/.env.example
@@ -159,13 +159,13 @@ KHS1994_LNMP_HTTPD_VERSION=2.4.33
 
 KHS1994_LNMP_MYSQL_VERSION=8.0.11
 
-KHS1994_LNMP_MARIADB_VERSION=10.3.6
+KHS1994_LNMP_MARIADB_VERSION=10.3.7
 
 KHS1994_LNMP_REDIS_VERSION=4.0.9
 
 KHS1994_LNMP_PHP_VERSION=7.2.6
 
-KHS1994_LNMP_MEMCACHED_VERSION=1.5.7
+KHS1994_LNMP_MEMCACHED_VERSION=1.5.8
 
 KHS1994_LNMP_RABBITMQ_VERSION=3.7.5
 

diff --git a/README.cn.md b/README.cn.md
@@ -20,7 +20,7 @@ More Than LNMP Docker，LNMP 全流程、全平台、全环境解决方案。
 
 本项目支持 `x86_64` 架构的 Linux，macOS，Windows 10 并且支持 `arm` 架构的 Debian(树莓派)。
 
-**警告** 除了 `.env` 文件，本项目中的任何文件严禁二次修改。[为什么？]([Why ?](https://github.com/khs1994-docker/lnmp/issues/238))
+**警告** 除了 `.env` 文件，本项目中的任何文件严禁二次修改。[为什么？](https://github.com/khs1994-docker/lnmp/issues/238)
 
 ## 使用 k8s ?
 
@@ -227,13 +227,13 @@ $ ./lnmp-docker.sh down
 |[NGINX](https://github.com/docker-library/docs/tree/master/nginx)         |`nginx:1.13.12-alpine`      | **1.13.12**            |`Alpine:3.7`    |
 |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.33-alpine`       | **2.4.33**             |`Alpine:3.7`    |
 |[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.11`              | **8.0.11**             |`Debian:stretch`|
-|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.3.6`            | **10.3.6**             |`Debian:jessie` |
+|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.3.7`            | **10.3.7**             |`Debian:jessie` |
 |[Redis](https://github.com/docker-library/docs/tree/master/redis)         |`redis:4.0.9-alpine`        | **4.0.9**              |`Alpine:3.7`    |
 |[PHP-FPM](https://github.com/khs1994-docker/php-fpm)                      |`khs1994/php-fpm:7.2.6-alpine3.7`  | **7.2.6**       |`Alpine:3.7`    |
 |[Laravel](https://github.com/laravel/laravel)                             |`khs1994/php-fpm:7.2.6-alpine3.7`  | **5.6.x**       |`Alpine:3.7`    |
 |[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php-fpm:7.2.6-alpine3.7`  | **1.6.5**       |`Alpine:3.7`    |
 |[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)              |`khs1994/php-fpm:7.2.6-alpine3.7`  | **2.11.1**      |`Alpine:3.7`    |
-|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.7-alpine`           | **1.5.7**        |`Alpine:3.7`    |
+|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.8-alpine`           | **1.5.8**        |`Alpine:3.7`    |
 |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.7.5-management-alpine` | **3.7.5**       |`Alpine:3.7`    |
 |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:10.4-alpine`             | **10.4**        |`Alpine:3.7`    |
 |[MongoDB](https://github.com/docker-library/docs/tree/master/mongo)       |`mongo:3.7.9`                      | **3.7.9**       |`Debian:jessie` |

diff --git a/README.md b/README.md
@@ -222,13 +222,13 @@ Please see [Documents](docs#%E6%BB%A1%E8%B6%B3-lnmp-%E5%BC%80%E5%8F%91%E5%85%A8%
 |[NGINX](https://github.com/docker-library/docs/tree/master/nginx)         |`nginx:1.13.12-alpine`      | **1.13.12**            |`Alpine:3.7`    |
 |[HTTPD](https://github.com/docker-library/docs/tree/master/httpd)         |`httpd:2.4.33-alpine`       | **2.4.33**             |`Alpine:3.7`    |
 |[MySQL](https://github.com/docker-library/docs/tree/master/mysql)         |`mysql:8.0.11`              | **8.0.11**             |`Debian:stretch`|
-|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.3.6`            | **10.3.6**             |`Debian:jessie` |
+|[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb)     |`mariadb:10.3.7`            | **10.3.7**             |`Debian:jessie` |
 |[Redis](https://github.com/docker-library/docs/tree/master/redis)         |`redis:4.0.9-alpine`        | **4.0.9**              |`Alpine:3.7`    |
 |[PHP-FPM](https://github.com/khs1994-docker/php-fpm)                      |`khs1994/php-fpm:7.2.6-alpine3.7`  | **7.2.6**       |`Alpine:3.7`    |
 |[Laravel](https://github.com/laravel/laravel)                             |`khs1994/php-fpm:7.2.6-alpine3.7`  | **5.6.x**       |`Alpine:3.7`    |
 |[Composer](https://github.com/docker-library/docs/tree/master/composer)   |`khs1994/php-fpm:7.2.6-alpine3.7`  | **1.6.5**       |`Alpine:3.7`    |
 |[PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)              |`khs1994/php-fpm:7.2.6-alpine3.7`  | **2.11.1**      |`Alpine:3.7`    |
-|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.7-alpine`           | **1.5.7**        |`Alpine:3.7`    |
+|[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.5.8-alpine`           | **1.5.8**        |`Alpine:3.7`    |
 |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq)   |`rabbitmq:3.7.5-management-alpine` | **3.7.5**       |`Alpine:3.7`    |
 |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:10.4-alpine`             | **10.4**        |`Alpine:3.7`    |
 |[MongoDB](https://github.com/docker-library/docs/tree/master/mongo)       |`mongo:3.7.9`                      | **3.7.9**       |`Debian:jessie` |

diff --git a/dockerfile/arm32v7/php-fpm/.env.example b/dockerfile/arm32v7/php-fpm/.env.example
@@ -1,2 +1,2 @@
 DOCKER_HUB_USERNAME=khs1994
-TAG=7.2.5
+TAG=7.2.6
diff --git a/dockerfile/arm32v7/php-fpm/Dockerfile b/dockerfile/arm32v7/php-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm32v7/php:7.2.5-fpm-stretch@sha256:f4cde3011529e8af5f8c6e110609ac6796f69dc98e1e47c9818f7864053f7e2b
+FROM arm32v7/php:7.2.6-fpm-stretch@sha256:c481aee0899e021a1f0b2904addc52588353d247261522ad2bb6d46b8ea0488a
 
 LABEL maintainer="khs1994-docker/lnmp <[email protected]>"
 

diff --git a/dockerfile/arm32v7/php-fpm/docker-compose.yml b/dockerfile/arm32v7/php-fpm/docker-compose.yml
@@ -7,4 +7,4 @@ services:
       args:
         DEB_URL: mirrors.ustc.edu.cn # deb.debian.org
         DEB_SECURITY_URL: mirrors.ustc.edu.cn/debian-security/ # security.debian.org
-    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm32v7-php-fpm:${TAG:-7.2.5}-stretch
+    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm32v7-php-fpm:${TAG:-7.2.6}-stretch
diff --git a/dockerfile/arm32v7/php/.env.example b/dockerfile/arm32v7/php/.env.example
@@ -1,2 +1,2 @@
 DOCKER_HUB_USERNAME=khs1994
-TAG=7.2.5
+TAG=7.2.6
diff --git a/dockerfile/arm32v7/php/docker-compose.yml b/dockerfile/arm32v7/php/docker-compose.yml
@@ -7,4 +7,4 @@ services:
       args:
         DEB_URL: mirrors.ustc.edu.cn # deb.debian.org
         DEB_SECURITY_URL: mirrors.ustc.edu.cn/debian-security # security.debian.org/debian-security
-    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm32v7-php-fpm:${TAG:-7.2.5}-stretch
+    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm32v7-php-fpm:${TAG:-7.2.6}-stretch
diff --git a/dockerfile/arm32v7/php/example.Dockerfile b/dockerfile/arm32v7/php/example.Dockerfile
@@ -1,4 +1,4 @@
-FROM arm32v7/php:7.2.5-fpm-stretch@sha256:f4cde3011529e8af5f8c6e110609ac6796f69dc98e1e47c9818f7864053f7e2b
+FROM arm32v7/php:7.2.6-fpm-stretch@sha256:c481aee0899e021a1f0b2904addc52588353d247261522ad2bb6d46b8ea0488a
 
 LABEL maintainer="khs1994-docker/lnmp <[email protected]>"
 

diff --git a/dockerfile/arm64v8/php-fpm/.env.example b/dockerfile/arm64v8/php-fpm/.env.example
@@ -1,2 +1,2 @@
 DOCKER_HUB_USERNAME=khs1994
-TAG=7.2.5
+TAG=7.2.6
diff --git a/dockerfile/arm64v8/php-fpm/Dockerfile b/dockerfile/arm64v8/php-fpm/Dockerfile
@@ -1,6 +1,6 @@
-ARG PHP_VERSION=7.2.5
+ARG PHP_VERSION=7.2.6
 
-FROM arm64v8/php:7.2.5-fpm-alpine3.7@sha256:77f7d021632c1246e3352d5b4d10a3a232f6e23567e8a4a17f946621573686c6
+FROM arm64v8/php:7.2.6-fpm-alpine3.7@sha256:cefd57745e0110966eca370d0636280ed74713c6d27f335bf4fede57285b90b8
 
 LABEL maintainer="khs1994-docker/lnmp <[email protected]>"
 

diff --git a/dockerfile/arm64v8/php-fpm/docker-compose.yml b/dockerfile/arm64v8/php-fpm/docker-compose.yml
@@ -6,4 +6,4 @@ services:
       context: .
       args:
         ALPINE_URL: mirrors.ustc.edu.cn
-    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm64v8-php-fpm:${TAG:-7.2.5}-alpine3.7
+    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm64v8-php-fpm:${TAG:-7.2.6}-alpine3.7
diff --git a/dockerfile/arm64v8/php/.env.example b/dockerfile/arm64v8/php/.env.example
@@ -1,2 +1,2 @@
 DOCKER_HUB_USERNAME=khs1994
-TAG=7.2.5
+TAG=7.2.6
diff --git a/dockerfile/arm64v8/php/docker-compose.yml b/dockerfile/arm64v8/php/docker-compose.yml
@@ -6,4 +6,4 @@ services:
       context: .
       args:
         ALPINE_URL: mirrors.ustc.edu.cn
-    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm64v8-php-fpm:${TAG:-7.2.5}-alpine3.7
+    image: ${DOCKER_HUB_USERNAME:-khs1994}/arm64v8-php-fpm:${TAG:-7.2.6}-alpine3.7