public-mirrors
/
docker-php-extension-installer
mirror of https://github.com/mlocati/docker-php-extension-installer
1
0
Fork 0
Code

Merge pull request #54 from mlocati/fix-gd-zip 

Fix GD and ZIP configuration with PHP 7.4.0
pull/57/head
Michele Locati 2019-12-06 17:43:53 +01:00 committed by GitHub
parent e6288d0a1d 16eeec2dec
commit cc7956a231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install-php-extensions
View File

@ -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 -
if test $1 -le 703; then
docker-php-ext-configure zip --with-libzip 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}"

8
scripts/travisci-test-new-extensions
View File

@ -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