From 78c42d0402a749c1a3f9a3fe135e1b7942ccc0f1 Mon Sep 17 00:00:00 2001
From: Luffy <52o@qq52o.cn>
Date: Fri, 10 Jan 2025 13:14:41 +0800
Subject: [PATCH] Fix ext-gd compilation error (#55)

---
 Dockerfile.base | 3 +--
 build.sh        | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.base b/Dockerfile.base
index e75a362..4071d72 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -40,10 +40,9 @@ RUN sed -i "s/<shell>/$(use bash sh)/g" /bin/init_typecho \
         --with-freetype${CONFIG} \
         --with-jpeg${CONFIG} \
         --with-webp${CONFIG} \
-    && docker-php-ext-install -j "$(nproc)" gd \
+    && docker-php-ext-install -j "$(nproc)" ${PHP_EXTENSION} \
     && CFLAGS="$CFLAGS ${PHP8_SOCKETS_WORKAROUND}" docker-php-ext-install -j "$(nproc)" \
         sockets \
-    && docker-php-ext-install -j "$(nproc)" ${PHP_EXTENSION} \
     && download ${URL} \
     && after "${savedAptMark}"
 
diff --git a/build.sh b/build.sh
index f2c145f..b8b633c 100755
--- a/build.sh
+++ b/build.sh
@@ -53,7 +53,7 @@ PUSH=""
 CONFIG="-dir=/usr/include/"
 BUILDX="build"
 PHP8_SOCKETS_WORKAROUND=""
-PHP_EXTENSION="bcmath exif zip mysqli pdo_mysql pdo_pgsql tokenizer opcache"
+PHP_EXTENSION="gd bcmath exif zip mysqli pdo_mysql pdo_pgsql tokenizer opcache"
 
 cat Dockerfile.base > Dockerfile
 
@@ -85,7 +85,7 @@ fi
 
 # disable tokenzier extension for php 8.1
 if [[ ${php} == "8.1" || ${php} == "8.2" ]]; then
-    PHP_EXTENSION="bcmath exif zip mysqli pdo_mysql pdo_pgsql opcache"
+    PHP_EXTENSION="gd bcmath exif zip mysqli pdo_mysql pdo_pgsql opcache"
 fi
 
 TAG="${LEFT}${MIDDLE}${RIGHT}"