ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fixing ghostscript env option
This commit is contained in:
Mahmoud Zalt 2017-04-11 13:24:29 -04:00 committed by GitHub
parent b86211d2d8 ef38dd1532
commit ddabb4620e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

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

3
php-fpm/Dockerfile-70
View File

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

2
php-fpm/Dockerfile-71
View File

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