Merge pull request #119 from stronk7/7.4-buster-back_to_pecl_solr

Back to pecl solr from manually patched and compiled one (php74)

Author: sarjona

root/tmp/setup/php-extensions.sh

@@ -58,29 +58,16 @@ docker-php-ext-install -j$(nproc) gd
 docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
 docker-php-ext-install -j$(nproc) ldap
 
-# Memcached, MongoDB, Redis, APCu, igbinary.
-pecl install memcached mongodb redis apcu igbinary uuid
-docker-php-ext-enable memcached mongodb redis apcu igbinary uuid
+# Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid
+pecl install memcached mongodb redis apcu igbinary solr uuid
+docker-php-ext-enable memcached mongodb redis apcu igbinary solr uuid
 
 # ZIP
 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
 
-# Install custom solr extension. Last release (2.4.0) is not working at all
-# with php72 and php73 and upstream has not either! Solution:
-#   - current master (as of 21th May 2019):
-#     https://github.com/php/pecl-search_engine-solr/commit/98a8bf540bcb4e9b2e1378cce2f3a9bf6cd772b8
-#   - this patch, applied already upstream:
-#     https://github.com/php/pecl-search_engine-solr/commit/744e32915d5989101267ed2c84a407c582dc6f31
-# So, following the experience with Macports, and https://bugs.php.net/bug.php?id=75631
-# we are going to try 2.4.0 release + macports patch. Old, but working right now.
-# References:
-#   - https://github.com/moodlehq/moodle-php-apache/issues/16 (part of the php72 image discussion)
-#   - https://github.com/moodlehq/moodle-php-apache/issues/19 (awaiting for a better solution)
-/tmp/setup/solr-extension.sh
-
 # Install Microsoft dependencies for sqlsrv.
 # (kept apart for clarity, still need to be run here
 # before some build packages are deleted)