Skip to content

Commit ddabb46

Browse files
authored
Merge pull request laradock#784 from winfried-van-loon/645-php-fpm-ghostscript
Fixing ghostscript env option
2 parents b86211d + ef38dd1 commit ddabb46

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ services:
6666
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
6767
- INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
6868
- INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
69+
- INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
6970
dockerfile: "Dockerfile-${PHP_VERSION}"
7071
volumes_from:
7172
- applications

php-fpm/Dockerfile-70

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ RUN if [ ${INSTALL_INTL} = true ]; then \
280280
# GHOSTSCRIPT:
281281
#####################################
282282

283-
ARG GHOSTSCRIPT=false
283+
ARG INSTALL_GHOSTSCRIPT=false
284284
RUN if [ ${GHOSTSCRIPT} = true ]; then \
285285
# Install the ghostscript extension
286286
# for PDF editing
@@ -290,7 +290,6 @@ RUN if [ ${GHOSTSCRIPT} = true ]; then \
290290
ghostscript \
291291
;fi
292292

293-
294293
#
295294
#--------------------------------------------------------------------------
296295
# Final Touch

php-fpm/Dockerfile-71

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ RUN if [ ${INTL} = true ]; then \
161161
# GHOSTSCRIPT:
162162
#####################################
163163

164-
ARG GHOSTSCRIPT=false
164+
ARG INSTALL_GHOSTSCRIPT=false
165165
RUN if [ ${GHOSTSCRIPT} = true ]; then \
166166
# Install the ghostscript extension
167167
# for PDF editing

0 commit comments

Comments
 (0)