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

Merge pull request #2771 from frenkiherlambang/fix-gd-unrecognized-options-on-php7.4 

fix unrecognized options GD config on php 7.4
This commit is contained in:
Shao Yu-Lung (Allen) 2020-12-17 16:33:01 +08:00 committed by GitHub
parent a2622323cf 351d24dcf6
commit 0adbdaab19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel-horizon/Dockerfile
View File

@ -57,7 +57,11 @@ RUN if [ ${INSTALL_BZ2} = true ]; then \
ARG INSTALL_GD=false ARG INSTALL_GD=false
RUN if [ ${INSTALL_GD} = true ]; then \ RUN if [ ${INSTALL_GD} = true ]; then \
apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \ apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \
docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/ && \ if [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \
docker-php-ext-configure gd --with-freetype --with-jpeg; \
else \
docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/; \
fi && \
docker-php-ext-install gd \ docker-php-ext-install gd \
;fi ;fi