Skip to content

Commit 85e7de1

Browse files
authored
Update install.sh
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
1 parent 841fdfc commit 85e7de1

1 file changed

Lines changed: 1 addition & 8 deletions

File tree

extension/install.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,6 @@ fi
186186

187187
if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
188188
echo "---------- Install gd ----------"
189-
isPhpVersionGreaterOrEqual 8 0
190-
191-
if [[ "$?" = "1" ]]; then
192-
options="--with-freetype --with-jpeg --with-webp"
193-
else
194-
options="--with-gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/"
195-
fi
196189

197190
apk add --no-cache \
198191
freetype \
@@ -202,7 +195,7 @@ if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
202195
libjpeg-turbo \
203196
libjpeg-turbo-dev \
204197
libwebp-dev \
205-
&& docker-php-ext-configure gd ${options} \
198+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
206199
&& docker-php-ext-install ${MC} gd \
207200
&& apk del \
208201
freetype-dev \

0 commit comments

Comments
 (0)