fix:8.3.3

Tinywan · Mar 3, 2024 · 6c7889d · 6c7889d
1 parent 1267935
commit 6c7889d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -13,9 +13,9 @@ on:
       - "**"
     tags:
       - "v*.*.*"
-  pull_request:
-    branches:
-      - "main"
+  # pull_request:
+  #   branches:
+  #     - "main"
 
 env:
   # Use docker.io for Docker Hub if empty

diff --git a/extension/install.sh b/extension/install.sh
@@ -187,15 +187,7 @@ fi
 
 if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
     echo "---------- Install gd ----------"
-    isPhpVersionGreaterOrEqual 8 0
-
-    if [[ "$?" = "1" ]]; then
-        # "--with-xxx-dir" was removed from php 7.4,
-        # issue: https://github.com/docker-library/php/issues/912
-        options="--with-freetype --with-jpeg --with-webp"
-    else
-        options="--with-gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/"
-    fi
+    options="--with-freetype --with-jpeg --with-webp"
 
     apk add --no-cache \
         freetype \