Release v17.11

khs1994 · web-flow · commit eb016440ec81 · 2017-11-30T10:00:56.000-06:00
Release v17.11 (#57)
diff --git a/.env.example b/.env.example
@@ -31,7 +31,7 @@ KHS1994_LNMP_MYSQL_VERSION=5.7.20
 
 KHS1994_LNMP_REDIS_VERSION=4.0.2
 
-KHS1994_LNMP_PHP_VERSION=7.1.11
+KHS1994_LNMP_PHP_VERSION=7.1.12
 
 KHS1994_LNMP_MEMCACHED_VERSION=1.5.3
 
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,11 @@
 Changelog
 ==============
 
+#### v17.11 (2017-12-01)
+
+Updates:
+* `php-fpm` 7.1.12
+
 #### v17.11 rc14
 
 Updates:
@@ -38,6 +43,7 @@ Updates:
 
 Changes:
 * `khs1994-docker/lnmp` v17.09 End Of Life
+
 Updates:
 * `Memcached` 1.5.3
 * `RabbitMQ` 3.6.14
@@ -77,6 +83,6 @@ Updates:
 Updates:
 * `Docker Compose` 1.17.0-rc1
 
-#### v17.10 (2017-11-01) EOL
+#### [v17.10 (2017-11-01) EOL](https://github.com/khs1994-docker/lnmp/releases/tag/v17.10)
 
-#### v17.09 (2017-10-14) EOL
+#### [v17.09 (2017-10-14) EOL](https://github.com/khs1994-docker/lnmp/releases/tag/v17.09)
diff --git a/README.cn.md b/README.cn.md
@@ -18,9 +18,9 @@
 
 最新的提交位于 [dev](https://github.com/khs1994-docker/lnmp/tree/dev) 分支。
 
-* [v17.10 2017-11-01](https://github.com/khs1994-docker/lnmp/releases/tag/v17.10)
+* [v17.11 2017-12-01](https://github.com/khs1994-docker/lnmp/releases/tag/v17.11)
 
-* [v17.09 2017-10-14](https://github.com/khs1994-docker/lnmp/releases/tag/v17.09) **EOL**
+* [v17.10 2017-11-01](https://github.com/khs1994-docker/lnmp/releases/tag/v17.10) **EOL**
 
 # 准备
 
@@ -53,7 +53,7 @@ $ ./lnmp-docker.sh devlopment
 
 $ curl 127.0.0.1
 
-Welcome use khs1994-docker/lnmp v17.10 x86_64 With Pull Docker Image
+Welcome use khs1994-docker/lnmp v17.11 x86_64 With Pull Docker Image
 
 development
 
diff --git a/README.md b/README.md
@@ -17,9 +17,9 @@ Updates every month, Version name is `YY-MM`. For more release information about
 
 Latest commit in dev branch, please switch [dev](https://github.com/khs1994-docker/lnmp/tree/dev) branch.
 
-* [v17.10 2017-11-01](https://github.com/khs1994-docker/lnmp/releases/tag/v17.10)
+* [v17.11 2017-12-01](https://github.com/khs1994-docker/lnmp/releases/tag/v17.11)
 
-* [v17.09 2017-10-14](https://github.com/khs1994-docker/lnmp/releases/tag/v17.09) **EOL**
+* [v17.10 2017-11-01](https://github.com/khs1994-docker/lnmp/releases/tag/v17.10) **EOL**
 
 # Prerequisites
 
@@ -48,7 +48,7 @@ $ ./lnmp-docker.sh devlopment
 
 $ curl 127.0.0.1
 
-Welcome use khs1994-docker/lnmp v17.10 x86_64 With Pull Docker Image
+Welcome use khs1994-docker/lnmp v17.11 x86_64 With Pull Docker Image
 
 development
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,7 +32,13 @@ services:
       - type: volume
         source: redis-data
         target: /data
-      - ./logs/redis:/var/log/redis:rw
+        volume:
+          nocopy: true
+      # - ./logs/redis:/var/log/redis:rw
+      - type: bind
+        source: ./logs/redis
+        target: /var/log/redis
+        read_only: false
     command: ["redis-server","/redis.conf"]
 
   # memcached:
diff --git a/docker-stack.yml b/docker-stack.yml
diff --git a/dockerfile/.env.example b/dockerfile/.env.example
@@ -31,7 +31,7 @@ KHS1994_LNMP_MYSQL_VERSION=5.7.20
 
 KHS1994_LNMP_REDIS_VERSION=4.0.2
 
-KHS1994_LNMP_PHP_VERSION=7.1.11
+KHS1994_LNMP_PHP_VERSION=7.1.12
 
 KHS1994_LNMP_MEMCACHED_VERSION=1.5.3
 
diff --git a/dockerfile/README.md b/dockerfile/README.md
@@ -5,13 +5,7 @@
 # Build Image Use IN Docker Swarm
 
 ```bash
-$ docker-compose -f docker-compose.swarm-build.yml build
-```
-
-# Test Image
-
-```bash
-$ docker-compose -f docker-compose.test.yml up -d
+$ docker-compose -f docker-stack.build.yml build
 ```
 
 # Push Image To Docker Registry
diff --git a/dockerfile/docker-stack.build.yml b/dockerfile/docker-stack.build.yml
diff --git a/dockerfile/php-fpm/.env b/dockerfile/php-fpm/.env
@@ -1,2 +1,2 @@
 DOCKER_HUB_USERNAME=khs1994
-TAG=7.1.11
+TAG=7.1.12
diff --git a/dockerfile/php-fpm/Dockerfile b/dockerfile/php-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1.11-fpm-alpine3.4
+FROM php:7.1.12-fpm-alpine3.4
 
 ENV TZ=Asia/Shanghai
 
diff --git a/env/.env b/env/.env
@@ -4,6 +4,6 @@
 # Version
 # 项目版本号
 
-KHS1994_LNMP_DOCKER_VERSION=v17.11-rc14
+KHS1994_LNMP_DOCKER_VERSION=v17.11
 DOCKER_COMPOSE_VERSION=1.17.1
 DOCKER_COMPOSE_VERSION_CORRECT_CONTENT="docker-compose version 1.17.1, build 6d101fb"
diff --git a/lnmp-docker.sh b/lnmp-docker.sh
@@ -124,27 +124,27 @@ dockerfile-update(){
   case $SOFT in
     memcached )
       dockerfile-update-sed $SOFT "FROM $SOFT:$VERSION-alpine" $VERSION
-      sed -i '' 's/^KHS1994_LNMP_MEMCACHED_VERSION.*/KHS1994_LNMP_MEMCACHED_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env .env
+      sed -i '' 's/^KHS1994_LNMP_MEMCACHED_VERSION.*/KHS1994_LNMP_MEMCACHED_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env dockerfile/.env.example .env
     ;;
     nginx )
       dockerfile-update-sed $SOFT "FROM $SOFT:$VERSION-alpine" $VERSION
-      sed -i '' 's/^KHS1994_LNMP_NGINX_VERSION.*/KHS1994_LNMP_NGINX_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env .env
+      sed -i '' 's/^KHS1994_LNMP_NGINX_VERSION.*/KHS1994_LNMP_NGINX_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env dockerfile/.env.example .env
     ;;
     php-fpm )
       dockerfile-update-sed $SOFT "FROM php:$VERSION-fpm-alpine3.4" $VERSION
-      sed -i '' 's/^KHS1994_LNMP_PHP_VERSION.*/KHS1994_LNMP_PHP_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env .env
+      sed -i '' 's/^KHS1994_LNMP_PHP_VERSION.*/KHS1994_LNMP_PHP_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env dockerfile/.env.example .env
     ;;
     postgresql )
       dockerfile-update-sed $SOFT "FROM postgres:$VERSION-alpine" $VERSIO
-      sed -i '' 's/^KHS1994_LNMP_POSTGRESQL_VERSION.*/KHS1994_LNMP_POSTGRESQL_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env .env
+      sed -i '' 's/^KHS1994_LNMP_POSTGRESQL_VERSION.*/KHS1994_LNMP_POSTGRESQL_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env dockerfile/.env.example .env
     ;;
     rabbitmq )
       dockerfile-update-sed $SOFT "FROM $SOFT:$VERSION-management-alpine" $VERSION
-      sed -i '' 's/^KHS1994_LNMP_RABBITMQ_VERSION.*/KHS1994_LNMP_RABBITMQ_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env .env
+      sed -i '' 's/^KHS1994_LNMP_RABBITMQ_VERSION.*/KHS1994_LNMP_RABBITMQ_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env dockerfile/.env.example .env
     ;;
     redis )
       dockerfile-update-sed $SOFT "FROM $SOFT:$VERSION-alpine" $VERSION
-      sed -i '' 's/^KHS1994_LNMP_REDIS_VERSION.*/KHS1994_LNMP_REDIS_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env .env
+      sed -i '' 's/^KHS1994_LNMP_REDIS_VERSION.*/KHS1994_LNMP_REDIS_VERSION='"${VERSION}"'/g' .env.example dockerfile/.env dockerfile/.env.example .env
     ;;
     * )
       print_error "Soft is not existing"
@@ -585,9 +585,13 @@ main() {
   swarm )
     run_docker
     docker stack deploy \
-      -c docker-compose.swarm.yml \
+      -c docker-stack.yml \
       lnmp
-    docker stack ps lnmp
+    if [ $? -eq 0 ];then
+      docker stack ps lnmp
+    else
+      exit 1
+    fi
     ;;
 
   swarm-down )
@@ -633,7 +637,8 @@ Commands:
   production-config    Validate and view the Production Compose file
   push                 Build and Pushes images to Docker Registory v2
   restore              Restore MySQL databases
-  swarm                Docker Swarm
+  swarm                Swarm mode
+  swarm-down           Down Swarm mode
 
 Container CLI:
   memcached-cli

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`DOCKER_HUB_USERNAME=khs1994`
`2`		`-TAG=7.1.11`
	`2`	`+TAG=7.1.12`