Skip to content

Commit 78c42d0

Browse files
authored
Fix ext-gd compilation error (#55)
1 parent 24ff534 commit 78c42d0

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Dockerfile.base

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ RUN sed -i "s/<shell>/$(use bash sh)/g" /bin/init_typecho \
4040
--with-freetype${CONFIG} \
4141
--with-jpeg${CONFIG} \
4242
--with-webp${CONFIG} \
43-
&& docker-php-ext-install -j "$(nproc)" gd \
43+
&& docker-php-ext-install -j "$(nproc)" ${PHP_EXTENSION} \
4444
&& CFLAGS="$CFLAGS ${PHP8_SOCKETS_WORKAROUND}" docker-php-ext-install -j "$(nproc)" \
4545
sockets \
46-
&& docker-php-ext-install -j "$(nproc)" ${PHP_EXTENSION} \
4746
&& download ${URL} \
4847
&& after "${savedAptMark}"
4948

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ PUSH=""
5353
CONFIG="-dir=/usr/include/"
5454
BUILDX="build"
5555
PHP8_SOCKETS_WORKAROUND=""
56-
PHP_EXTENSION="bcmath exif zip mysqli pdo_mysql pdo_pgsql tokenizer opcache"
56+
PHP_EXTENSION="gd bcmath exif zip mysqli pdo_mysql pdo_pgsql tokenizer opcache"
5757

5858
cat Dockerfile.base > Dockerfile
5959

@@ -85,7 +85,7 @@ fi
8585

8686
# disable tokenzier extension for php 8.1
8787
if [[ ${php} == "8.1" || ${php} == "8.2" ]]; then
88-
PHP_EXTENSION="bcmath exif zip mysqli pdo_mysql pdo_pgsql opcache"
88+
PHP_EXTENSION="gd bcmath exif zip mysqli pdo_mysql pdo_pgsql opcache"
8989
fi
9090

9191
TAG="${LEFT}${MIDDLE}${RIGHT}"

0 commit comments

Comments
 (0)