Skip to content

Commit 6c7889d

Browse files
committed
fix:8.3.3
1 parent 1267935 commit 6c7889d

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

.github/workflows/docker-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ on:
1313
- "**"
1414
tags:
1515
- "v*.*.*"
16-
pull_request:
17-
branches:
18-
- "main"
16+
# pull_request:
17+
# branches:
18+
# - "main"
1919

2020
env:
2121
# Use docker.io for Docker Hub if empty

extension/install.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,7 @@ fi
187187

188188
if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
189189
echo "---------- Install gd ----------"
190-
isPhpVersionGreaterOrEqual 8 0
191-
192-
if [[ "$?" = "1" ]]; then
193-
# "--with-xxx-dir" was removed from php 7.4,
194-
# issue: https://github.com/docker-library/php/issues/912
195-
options="--with-freetype --with-jpeg --with-webp"
196-
else
197-
options="--with-gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/"
198-
fi
190+
options="--with-freetype --with-jpeg --with-webp"
199191

200192
apk add --no-cache \
201193
freetype \

0 commit comments

Comments
 (0)