Skip to content

Commit 8c5a937

Browse files
authored
Merge pull request #117 from stronk7/7.2-buster-back_to_pecl_solr
Back to pecl solr from manually patched and compiled one (php72)
2 parents f50cfe7 + b3d9e0e commit 8c5a937

File tree

2 files changed

+3
-69
lines changed

2 files changed

+3
-69
lines changed

root/tmp/setup/php-extensions.sh

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,29 +58,16 @@ docker-php-ext-install -j$(nproc) gd
5858
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
5959
docker-php-ext-install -j$(nproc) ldap
6060

61-
# Memcached, MongoDB, Redis, APCu, igbinary.
62-
pecl install memcached mongodb redis apcu igbinary uuid
63-
docker-php-ext-enable memcached mongodb redis apcu igbinary uuid
61+
# Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid
62+
pecl install memcached mongodb redis apcu igbinary solr uuid
63+
docker-php-ext-enable memcached mongodb redis apcu igbinary solr uuid
6464

6565
# ZIP
6666
docker-php-ext-configure zip --with-libzip
6767
docker-php-ext-install zip
6868

6969
echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
7070

71-
# Install custom solr extension. Last release (2.4.0) is not working at all
72-
# with php72 and php73 and upstream has not either! Solution:
73-
# - current master (as of 21th May 2019):
74-
# https://github.com/php/pecl-search_engine-solr/commit/98a8bf540bcb4e9b2e1378cce2f3a9bf6cd772b8
75-
# - this patch, applied already upstream:
76-
# https://github.com/php/pecl-search_engine-solr/commit/744e32915d5989101267ed2c84a407c582dc6f31
77-
# So, following the experience with Macports, and https://bugs.php.net/bug.php?id=75631
78-
# we are going to try 2.4.0 release + macports patch. Old, but working right now.
79-
# References:
80-
# - https://github.com/moodlehq/moodle-php-apache/issues/16 (part of the php72 image discussion)
81-
# - https://github.com/moodlehq/moodle-php-apache/issues/19 (awaiting for a better solution)
82-
/tmp/setup/solr-extension.sh
83-
8471
# Install Microsoft dependencies for sqlsrv.
8572
# (kept apart for clarity, still need to be run here
8673
# before some build packages are deleted)

root/tmp/setup/solr-extension.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)