Merge pull request #105 from stronk7/master

Reconcile master with 7.4-buster

Author: stronk7

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.3-apache-buster
+FROM php:7.4-apache-buster
 
 ADD root/ /
 # Fix the original permissions of /tmp, the PHP default upload tmp dir.

root/tmp/setup/php-extensions.sh

@@ -51,7 +51,7 @@ docker-php-ext-install -j$(nproc) \
     xmlrpc
 
 # GD.
-docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
+docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
 docker-php-ext-install -j$(nproc) gd
 
 # LDAP.
@@ -63,7 +63,7 @@ pecl install memcached mongodb redis apcu igbinary uuid
 docker-php-ext-enable memcached mongodb redis apcu igbinary uuid
 
 # ZIP
-docker-php-ext-configure zip --with-libzip
+docker-php-ext-configure zip --with-zip
 docker-php-ext-install zip
 
 echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini

root/tmp/setup/sqlsrv-extension.sh

@@ -15,6 +15,6 @@ ACCEPT_EULA=Y apt-get install -y msodbcsql17
 
 ln -fsv /opt/mssql-tools/bin/* /usr/bin
 
-# Need 5.5.0preview (or later) for PHP 7.3 support
-pecl install sqlsrv-5.6.1
+# Need 5.7.0preview (or later) for PHP 7.4 support
+pecl install sqlsrv-5.7.0preview
 docker-php-ext-enable sqlsrv