瀏覽代碼

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

fix unrecognized options GD config on php 7.4
Shao Yu-Lung (Allen) 4 年之前
父節點
當前提交
0adbdaab19
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      laravel-horizon/Dockerfile

+ 5 - 1
laravel-horizon/Dockerfile

@@ -57,7 +57,11 @@ RUN if [ ${INSTALL_BZ2} = true ]; then \
 ARG INSTALL_GD=false
 RUN if [ ${INSTALL_GD} = true ]; then \
    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 \
 ;fi