Release v17.10

Release v17.10 (#36)

Changelog.md

@@ -5,6 +5,8 @@ Changelog
 
 `.env`:
 
+#### v17.10 (2017-11-01)
+
 #### v17.10 rc6
 
 Changes:

README.cn.md

@@ -113,6 +113,7 @@ $ docker-compose down
 
 # 项目国内镜像
 
+* TGit：https://git.qcloud.com/khs1994-docker/lnmp.git
 * 阿里云 CODE：https://code.aliyun.com/khs1994-docker/lnmp.git
 * 码云：https://gitee.com/khs1994/lnmp.git
 * Coding：https://git.coding.net/khs1994/lnmp.git

bin/composer

@@ -24,10 +24,10 @@ if [ ${ARCH} = "armv7l" -o ${ARCH} = "aarch64" ];then
   if [ ${ARCH} = "armv7l" ];then
     DOCKER_IMAGE=khs1994/arm32v7-php-fpm
   fi
-  TAG=${KHS1994_LNMP_PHP_VERSION}
+  TAG=${KHS1994_LNMP_PHP_VERSION}-jessie
 elif [ ${ARCH} = "x86_64" ];then
   DOCKER_IMAGE=khs1994/php-fpm
-  TAG=${KHS1994_LNMP_PHP_VERSION}-alpine
+  TAG=${KHS1994_LNMP_PHP_VERSION}-alpine3.4
 else
   echo -e "\n\033[32mINFO\033[0m  ${ARCH} 暂不支持"
   error
@@ -39,7 +39,7 @@ fi
 echo -e  "\n\033[32mINFO\033[0m  在 ${DOCKER_IMAGE}:${TAG} 内 /app/${COMPOSE_PATH} 执行 $ composer ${CMD}" && echo -e  "\n\033[32mINFO\033[0m  以下为输出内容\n\n"
 
 docker run -it --rm \
-  -v $PWD/app/${COMPOSE_PATH}:/app/${COMPOSE_PATH} \
+  -v $PWD/app/${COMPOSE_PATH}:/app \
   -v $PWD/tmp/cache:/tmp/cache \
   ${DOCKER_IMAGE}:${TAG} \
   composer ${CMD}

bin/laravel

@@ -23,10 +23,10 @@ if [ ${ARCH} = "armv7l" -o ${ARCH} = "aarch64" ];then
   if [ ${ARCH} = "armv7l" ];then
     DOCKER_IMAGE=khs1994/arm32v7-php-fpm
   fi
-  TAG=${KHS1994_LNMP_PHP_VERSION}
+  TAG=${KHS1994_LNMP_PHP_VERSION}-jessie
 elif [ ${ARCH} = "x86_64" ];then
   DOCKER_IMAGE=khs1994/php-fpm
-  TAG=${KHS1994_LNMP_PHP_VERSION}-alpine
+  TAG=${KHS1994_LNMP_PHP_VERSION}-alpine3.4
 else
   echo -e "\n\033[32mINFO\033[0m  ${ARCH} 暂不支持"
   error

bin/php-artisan

@@ -24,10 +24,10 @@ if [ ${ARCH} = "armv7l" -o ${ARCH} = "aarch64" ];then
   if [ ${ARCH} = "armv7l" ];then
     DOCKER_IMAGE=khs1994/arm32v7-php-fpm
   fi
-  TAG=${KHS1994_LNMP_PHP_VERSION}
+  TAG=${KHS1994_LNMP_PHP_VERSION}-jessie
 elif [ ${ARCH} = "x86_64" ];then
   DOCKER_IMAGE=khs1994/php-fpm
-  TAG=${KHS1994_LNMP_PHP_VERSION}-alpine
+  TAG=${KHS1994_LNMP_PHP_VERSION}-alpine3.4
 else
   echo -e "\n\033[32mINFO\033[0m  ${ARCH} 暂不支持"
   error
@@ -39,6 +39,6 @@ fi
 echo -e  "\n\033[32mINFO\033[0m  在 ${DOCKER_IMAGE}:${TAG} 内 /app/${LARAVEL_PATH} 执行 $ php artisan ${CMD}" && echo -e  "\n\033[32mINFO\033[0m  以下为输出内容\n\n"
 
 docker run -it --rm \
-  -v $PWD/app/${LARAVEL_PATH}:/app/${LARAVEL_PATH} \
+  -v $PWD/app/${LARAVEL_PATH}:/app \
   ${DOCKER_IMAGE}:${TAG} \
   php artisan ${CMD}

docker-compose.arm.yml

@@ -104,7 +104,7 @@ services:
     #   context: ./dockerfile/${ARM_ARCH}/php-fpm/
     #   dockerfile: Dockerfile
     restart: always
-    image: "khs1994/${ARM_ARCH}-php-fpm:${KHS1994_LNMP_PHP_VERSION}"
+    image: "khs1994/${ARM_ARCH}-php-fpm:${KHS1994_LNMP_PHP_VERSION}-jessie"
     networks:
       - frontend
       - backend

docker-compose.override.yml

@@ -16,7 +16,7 @@ services:
   #   image: ${DEVELOPMENT_DOCKER_IMAGE_PREFIX}/postgres:${KHS1994_LNMP_POSTGRESQL_VERSION}-alpine
 
   php7:
-    image: ${DEVELOPMENT_DOCKER_IMAGE_PREFIX}/php-fpm:${KHS1994_LNMP_PHP_VERSION}-alpine
+    image: ${DEVELOPMENT_DOCKER_IMAGE_PREFIX}/php-fpm:${KHS1994_LNMP_PHP_VERSION}-alpine3.4
     environment:
       - APP_ENV=development
       - KHS1994_LNMP_DOCKER_VERSION=${KHS1994_LNMP_DOCKER_VERSION} x86_64 With Pull Docker Image

docker-compose.prod.yml

@@ -15,7 +15,7 @@ services:
   #   image: ${PRODUCTIOM_DOCKER_IMAGE_PREFIX}/postgres:${KHS1994_LNMP_POSTGRESQL_VERSION}-alpine
 
   php7:
-    image: ${PRODUCTIOM_DOCKER_IMAGE_PREFIX}/php-fpm:${KHS1994_LNMP_PHP_VERSION}-alpine
+    image: ${PRODUCTIOM_DOCKER_IMAGE_PREFIX}/php-fpm:${KHS1994_LNMP_PHP_VERSION}-alpine3.4
     volumes:
       - ~/.ssh:/root/.ssh:rw
       - ./app:${PRODUCTION_LNMP_PHP_PATH}:rw

docker-compose.push.yml

@@ -5,7 +5,7 @@ services:
     build:
       context: ./dockerfile/redis/
       dockerfile: Dockerfile
-    # 镜像推送到私有仓库  
+    # 镜像推送到私有仓库
     image: "${REGISTRY_URL_AND_USERNAME}/redis:${KHS1994_LNMP_REDIS_VERSION}-alpine"
 
   php7:
@@ -20,7 +20,7 @@ services:
         com.khs1994.description: "Extend Official PHP_FPM Docker Image"
         com.khs1994.department: "Chinese"
         com.khs1994.label-with-empty-value: ""
-    image: ${REGISTRY_URL_AND_USERNAME}/php-fpm:${KHS1994_LNMP_PHP_VERSION}-alpine
+    image: ${REGISTRY_URL_AND_USERNAME}/php-fpm:${KHS1994_LNMP_PHP_VERSION}-alpine3.4
 
   # memcached:
   #   build:

docker-compose.yml

@@ -84,7 +84,7 @@ services:
 
   php7:
     restart: always
-    image: "${DEVELOPMENT_DOCKER_IMAGE_WITH_BUILD_PREFIX}php:${KHS1994_LNMP_PHP_VERSION}-alpine"
+    image: "${DEVELOPMENT_DOCKER_IMAGE_WITH_BUILD_PREFIX}php:${KHS1994_LNMP_PHP_VERSION}-alpine3.4"
     # container_name: khs1994-docker-lnmp-php-fpm
     volumes:
       - ./config/php/php-fpm.d/docker.conf:/usr/local/etc/php-fpm.d/docker.conf:ro

dockerfile/arm32v7/php-fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM arm32v7/php:7.1.11-fpm
+FROM arm32v7/php:7.1.11-fpm-jessie
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai  /etc/localtime
 
@@ -17,9 +17,10 @@ RUN set -xe \
         libmemcached-dev \
         libpq-dev \
         zlib1g-dev \
+				libsqlite3-dev \
 	" \
   && apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -r /var/lib/apt/lists/* \
-    	   && docker-php-ext-install -j$(nproc) bcmath iconv mcrypt pdo_pgsql pdo_mysql zip \
+    	   && docker-php-ext-install -j$(nproc) bcmath iconv mcrypt pdo_pgsql pdo_mysql pdo_sqlite zip \
     	   && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     	   && docker-php-ext-install -j$(nproc) gd \
          && pecl install mongodb \

dockerfile/arm32v7/php-fpm/docker-compose.yml

@@ -3,4 +3,4 @@ services:
 
   arm32v7-php-fpm:
     build: .
-    image: ${DOCKER_HUB_USERNAME}/arm32v7-php-fpm:${TAG}
+    image: ${DOCKER_HUB_USERNAME}/arm32v7-php-fpm:${TAG}-jessie

dockerfile/arm64v8/php-fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM arm64v8/php:7.1.11-fpm
+FROM arm64v8/php:7.1.11-fpm-jessie
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai  /etc/localtime
 
@@ -17,9 +17,10 @@ RUN set -xe \
         libmemcached-dev \
         libpq-dev \
         zlib1g-dev \
+				libsqlite3-dev \
 	" \
   && apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -r /var/lib/apt/lists/* \
-    	   && docker-php-ext-install -j$(nproc) bcmath iconv mcrypt pdo_pgsql pdo_mysql zip \
+    	   && docker-php-ext-install -j$(nproc) bcmath iconv mcrypt pdo_pgsql pdo_mysql pdo_sqlite zip \
     	   && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     	   && docker-php-ext-install -j$(nproc) gd \
          && pecl install mongodb \

dockerfile/arm64v8/php-fpm/docker-compose.yml

@@ -3,4 +3,4 @@ services:
 
   arm64v8-php-fpm:
     build: .
-    image: ${DOCKER_HUB_USERNAME}/arm64v8-php-fpm:${TAG}
+    image: ${DOCKER_HUB_USERNAME}/arm64v8-php-fpm:${TAG}-jessie

dockerfile/php-fpm-alpine/.env

@@ -1,2 +1,2 @@
 DOCKER_HUB_USERNAME=khs1994
-TAG=7.1.10
+TAG=7.1.11

dockerfile/php-fpm-alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1.11-fpm-alpine
+FROM php:7.1.11-fpm-alpine3.4
 
 # 替换源
 
@@ -20,11 +20,12 @@ ENV KHS1994_PHP_FPM_DEPS \
                          cyrus-sasl-dev \
                          postgresql-dev \
                          zlib-dev \
-                         tzdata
+                         tzdata \
+                         sqlite-dev
 
 RUN set -xe \
         && apk add --no-cache $KHS1994_PHP_FPM_DEPS \
-        && docker-php-ext-install -j "$(nproc)" bcmath iconv mcrypt pdo_pgsql pdo_mysql zip \
+        && docker-php-ext-install -j "$(nproc)" bcmath iconv mcrypt pdo_pgsql pdo_mysql pdo_sqlite zip \
         && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
         && docker-php-ext-install -j "$(nproc)" gd \
         && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \

dockerfile/php-fpm-alpine/docker-compose.yml

@@ -3,4 +3,4 @@ services:
 
   php-fpm:
     build: .
-    image: ${DOCKER_HUB_USERNAME}/php-fpm:${TAG}-alpine
+    image: ${DOCKER_HUB_USERNAME}/php-fpm:${TAG}-alpine3.4

dockerfile/php-fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1.11-fpm
+FROM php:7.1.11-fpm-jessie
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai  /etc/localtime
 
@@ -17,9 +17,10 @@ RUN set -xe \
         libmemcached-dev \
         libpq-dev \
         zlib1g-dev \
+				libsqlite3-dev \
 	" \
   && apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -r /var/lib/apt/lists/* \
-    	   && docker-php-ext-install -j$(nproc) bcmath iconv mcrypt pdo_pgsql pdo_mysql zip \
+    	   && docker-php-ext-install -j$(nproc) bcmath iconv mcrypt pdo_pgsql pdo_mysql pdo_sqlite zip \
     	   && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     	   && docker-php-ext-install -j$(nproc) gd \
          && pecl install mongodb \

dockerfile/php-fpm/docker-compose.yml

@@ -3,4 +3,4 @@ services:
 
   php-fpm:
     build: .
-    image: ${DOCKER_HUB_USERNAME}/php-fpm:${TAG}
+    image: ${DOCKER_HUB_USERNAME}/php-fpm:${TAG}-jessie

env/.env

@@ -4,5 +4,5 @@
 # Version
 # 项目版本号
 
-KHS1994_LNMP_DOCKER_VERSION=v17.10-rc6
+KHS1994_LNMP_DOCKER_VERSION=v17.10
 DOCKER_COMPOSE_VERSION=1.16.1

lnmp-docker.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-if [ $1 = "development" -o $1 = "production" ];then
-  ENV=$1
+if [ ! -z $1 ];then
+  if [ $1 = "development" -o $1 = "production" ];then
+    ENV=$1
+  fi
 fi
 
 ARCH=`uname -m`
@@ -400,9 +402,21 @@ main() {
     ;;
 
   php )
+    if [ $ARCH="x86_64" ];then
+      PHP_CLI_DOCKER_IMAGE=php-fpm
+      PHP_CLI_DOCKER_TAG=${KHS1994_LNMP_PHP_VERSION}-alpine3.4
+    elif [ $ARCH="armv7l" ];then
+      PHP_CLI_DOCKER_IMAGE=arm32v7-php-fpm
+      PHP_CLI_DOCKER_TAG=${KHS1994_LNMP_PHP_VERSION}-jessie
+    elif [ $ARCH="aarch64" ];then
+      PHP_CLI_DOCKER_IMAGE=arm64v8-php-fpm
+      PHP_CLI_DOCKER_TAG=${KHS1994_LNMP_PHP_VERSION}-jessie
+    else
+      NOTSUPPORT
+    fi
     docker run -it --rm \
-      -v $PWD/app/$2:/app/$2 \
-      khs1994/php-fpm:${KHS1994_LNMP_PHP_VERSION} \
+      -v $PWD/app/$2:/app \
+      khs1994/${PHP_CLI_DOCKER_IMAGE}:${PHP_CLI_DOCKER_TAG} \
       php $3
    ;;