From ef38dd15328227c2f4dd05869a5f6905cd8b7835 Mon Sep 17 00:00:00 2001 From: Winfried Date: Tue, 11 Apr 2017 16:45:20 +0200 Subject: [PATCH] Fixing ghostscript env option --- docker-compose.yml | 1 + php-fpm/Dockerfile-70 | 3 +-- php-fpm/Dockerfile-71 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f38e6c2..b76edfee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,6 +67,7 @@ services: - INSTALL_MYSQL=${PHP_FPM_INSTALL_MYSQL} - 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 diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 11a1e3ec..828ccefe 100644 --- a/php-fpm/Dockerfile-70 +++ b/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 diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 94beab02..9c1702d8 100644 --- a/php-fpm/Dockerfile-71 +++ b/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