mirror of
https://github.com/danog/docker-php-extension-installer.git
synced 2024-12-11 08:59:51 +01:00
Merge pull request #54 from mlocati/fix-gd-zip
Fix GD and ZIP configuration with PHP 7.4.0
This commit is contained in:
commit
cc7956a231
@ -327,12 +327,14 @@ installBundledModule () {
|
|||||||
printf '### INSTALLING BUNDLED MODULE %s ###\n' "${2}"
|
printf '### INSTALLING BUNDLED MODULE %s ###\n' "${2}"
|
||||||
case "${2}" in
|
case "${2}" in
|
||||||
gd)
|
gd)
|
||||||
if test $1 -lt 700; then
|
if test $1 -le 506; then
|
||||||
docker-php-ext-configure gd --with-gd --with-vpx-dir --with-jpeg-dir --with-png-dir --with-zlib-dir --with-xpm-dir --with-freetype-dir --enable-gd-native-ttf
|
docker-php-ext-configure gd --with-gd --with-vpx-dir --with-jpeg-dir --with-png-dir --with-zlib-dir --with-xpm-dir --with-freetype-dir --enable-gd-native-ttf
|
||||||
elif test $1 -lt 702; then
|
elif test $1 -le 701; then
|
||||||
docker-php-ext-configure gd --with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir --with-xpm-dir --with-freetype-dir --enable-gd-native-ttf
|
docker-php-ext-configure gd --with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir --with-xpm-dir --with-freetype-dir --enable-gd-native-ttf
|
||||||
else
|
elif test $1 -le 703; then
|
||||||
docker-php-ext-configure gd --with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir --with-xpm-dir --with-freetype-dir
|
docker-php-ext-configure gd --with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir --with-xpm-dir --with-freetype-dir
|
||||||
|
else
|
||||||
|
docker-php-ext-configure gd --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
gmp)
|
gmp)
|
||||||
@ -386,7 +388,11 @@ installBundledModule () {
|
|||||||
cmake ..
|
cmake ..
|
||||||
make install
|
make install
|
||||||
cd -
|
cd -
|
||||||
docker-php-ext-configure zip --with-libzip
|
if test $1 -le 703; then
|
||||||
|
docker-php-ext-configure zip --with-libzip
|
||||||
|
else
|
||||||
|
docker-php-ext-configure zip --with-zip
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
docker-php-ext-install -j$(nproc) "${2}"
|
docker-php-ext-install -j$(nproc) "${2}"
|
||||||
|
@ -27,11 +27,11 @@ fi
|
|||||||
# Outputs:
|
# Outputs:
|
||||||
# the full docker image ID
|
# the full docker image ID
|
||||||
getExtensionImage () {
|
getExtensionImage () {
|
||||||
if test "${2}" = '7.4'; then
|
case "${2}" in
|
||||||
getExtensionImage_version='7.4.0RC3'
|
*)
|
||||||
else
|
getExtensionImage_version="${2}"
|
||||||
getExtensionImage_version="${2}"
|
;;
|
||||||
fi
|
esac
|
||||||
getExtensionImage_result="php:${getExtensionImage_version}-cli"
|
getExtensionImage_result="php:${getExtensionImage_version}-cli"
|
||||||
getExtensionImage_reqs="${TRAVIS_BUILD_DIR}/data/special-requirements"
|
getExtensionImage_reqs="${TRAVIS_BUILD_DIR}/data/special-requirements"
|
||||||
if test -f "${getExtensionImage_reqs}"; then
|
if test -f "${getExtensionImage_reqs}"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user