From 727561729787b9fddb279b2795e799eca8b1b516 Mon Sep 17 00:00:00 2001 From: Luffy <52o@qq52o.cn> Date: Fri, 10 Jan 2025 13:01:13 +0800 Subject: [PATCH] update ci --- Dockerfile.base | 1 - build.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile.base b/Dockerfile.base index 4010eb0..98d265a 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -40,7 +40,6 @@ RUN sed -i "s//$(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 index 4c550ea..41b888b 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}"