refactor(package_php): download WebP earlier

Author: EtienneM

support/package_php

@@ -6,9 +6,6 @@ if [ -n "$DEBUG" ]; then
   set -x
 fi
 
-apt-get update -qq
-apt-get install -qq --yes pkg-config libxml2-dev libssl-dev libsqlite3-dev
-
 basedir="$( cd -P "$( dirname "$0" )" && pwd )"
 source "$basedir/../conf/buildpack.conf"
 source "$basedir/lib/utils"
@@ -38,6 +35,10 @@ curl -L -o - "${PHP_BASE_URL}/package/libonig-${libonig_version}.tgz" | tar -C /
 export C_INCLUDE_PATH="$C_INCLUDE_PATH:/app/vendor/libonig/include"
 export PKG_CONFIG_PATH="/app/vendor/libonig/lib/pkgconfig:$PKG_CONFIG_PATH"
 
+echo "-----> Downloading dependency WebP library ${webp_version}"
+mkdir -p "/app/vendor/libwebp"
+curl "${PHP_BASE_URL}/package/libwebp-${webp_version}.tgz" | tar xz -C /app/vendor/libwebp
+
 echo "-----> Downloading PHP $php_version"
 curl -LO "https://php.net/distributions/php-${php_version}.tar.gz"
 tar -xzf "php-${php_version}.tar.gz"
@@ -48,27 +49,24 @@ install_zend_optimizer=$(cat <<SH
 SH
 )
 
-WITH_CURL_CONFIGURE=""
+WITH_CURL_CONFIGURE="--with-curl=/usr"
 if [ -d '/app/.apt/usr' ] ; then
     WITH_CURL_CONFIGURE="--with-curl=/app/.apt/usr"
 fi
 
-mkdir -p "/app/vendor/libwebp"
-curl "${PHP_BASE_URL}/package/libwebp-${webp_version}.tgz" | tar xz -C /app/vendor/libwebp
-
 export WEBP_LIBS="-L/app/vendor/libwebp/lib -lwebp"
 export WEBP_CFLAGS="-I/app/vendor/libwebp/include"
 
 mkdir -p "/app/vendor/php/etc/conf.d"
 
-echo "-----> Compile ZLib"
+echo "-----> Compile ZLib v${zlib_version}"
 pushd "zlib-${zlib_version}" >/dev/null
 ./configure --prefix=/app/vendor/php/zlib
 make
 make install
 popd > /dev/null
 
-echo "-----> Compile PHP"
+echo "-----> Compile PHP v${php_version}"
 pushd "php-${php_version}" >/dev/null
 ./configure --prefix=/app/vendor/php \
   --with-config-file-path=/app/vendor/php/etc \
@@ -89,7 +87,6 @@ pushd "php-${php_version}" >/dev/null
   --with-openssl \
   --enable-soap \
   --enable-xmlreader \
-  --with-curl=/usr \
   --with-xsl \
   --enable-fpm \
   --enable-mbstring \
@@ -106,7 +103,6 @@ popd > /dev/null
 
 eval "$install_zend_optimizer"
 
-echo "BINIOU: $(pwd)"
 mkdir package
 pushd /app/vendor/php > /dev/null
 tar zcf "${tempdir}/package/php-${php_version}.tgz" .