Merge pull request typecho#54 from lufei/fix/gd

lufei · Jan 10, 2025 · 24ff534 · 24ff534
2 parents 88ba0ee + d9e61f3
commit 24ff534
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile.base b/Dockerfile.base
@@ -40,6 +40,7 @@ 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 \
     && CFLAGS="$CFLAGS ${PHP8_SOCKETS_WORKAROUND}" docker-php-ext-install -j "$(nproc)" \
         sockets \
     && docker-php-ext-install -j "$(nproc)" ${PHP_EXTENSION} \

diff --git a/build.sh b/build.sh
@@ -53,7 +53,7 @@ PUSH=""
 CONFIG="-dir=/usr/include/"
 BUILDX="build"
 PHP8_SOCKETS_WORKAROUND=""
-PHP_EXTENSION="bcmath exif gd zip mysqli pdo_mysql pdo_pgsql tokenizer opcache"
+PHP_EXTENSION="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 gd zip mysqli pdo_mysql pdo_pgsql opcache"
+    PHP_EXTENSION="bcmath exif zip mysqli pdo_mysql pdo_pgsql opcache"
 fi
 
 TAG="${LEFT}${MIDDLE}${RIGHT}"