浏览代码

Merge pull request #784 from winfried-van-loon/645-php-fpm-ghostscript

Fixing ghostscript env option
Mahmoud Zalt 8 年之前
父节点
当前提交
ddabb4620e
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 0
      docker-compose.yml
  2. 1 2
      php-fpm/Dockerfile-70
  3. 1 1
      php-fpm/Dockerfile-71

+ 1 - 0
docker-compose.yml

@@ -66,6 +66,7 @@ services:
           - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
           - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
           - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
+          - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
         dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications

+ 1 - 2
php-fpm/Dockerfile-70

@@ -280,7 +280,7 @@ RUN if [ ${INSTALL_INTL} = true ]; then \
 # GHOSTSCRIPT:
 #####################################
 
-ARG GHOSTSCRIPT=false
+ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ ${GHOSTSCRIPT} = true ]; then \
     # Install the ghostscript extension
     # for PDF editing
@@ -290,7 +290,6 @@ RUN if [ ${GHOSTSCRIPT} = true ]; then \
     ghostscript \
 ;fi
 
-
 #
 #--------------------------------------------------------------------------
 # Final Touch

+ 1 - 1
php-fpm/Dockerfile-71

@@ -161,7 +161,7 @@ RUN if [ ${INTL} = true ]; then \
 # GHOSTSCRIPT:
 #####################################
 
-ARG GHOSTSCRIPT=false
+ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ ${GHOSTSCRIPT} = true ]; then \
     # Install the ghostscript extension
     # for PDF editing