Skip to content

Commit 8af8d85

Browse files
committed
Back to pecl solr from manually patched and compiled one
With the release of php-solr 2.5.1 (20200909) we can be back to the upstream extension. The problems in previous version (see php/pecl-search_engine-solr#16) have been fixed and it should work as is. This comes with php71, 72, 73, 74 and 80 support.
1 parent 2021ad6 commit 8af8d85

File tree

2 files changed

+3
-67
lines changed

2 files changed

+3
-67
lines changed

root/tmp/setup/php-extensions.sh

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ echo "Installing php extensions"
4545
# ZIP
4646
docker-php-ext-configure zip --with-zip
4747
docker-php-ext-install zip
48+
4849
docker-php-ext-install -j$(nproc) \
4950
intl \
5051
mysqli \
@@ -62,29 +63,17 @@ docker-php-ext-install -j$(nproc) gd
6263
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
6364
docker-php-ext-install -j$(nproc) ldap
6465

65-
# Memcached, MongoDB, Redis, APCu, igbinary, uuid.
66+
# Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid.
6667
pickle install memcached
6768
#pickle install mongodb -- not existing as of 8.0.0beta3
6869
#pickle install redis -- not existing as of 8.0.0beta3
6970
pickle install apcu
7071
pickle install igbinary
72+
pickle install solr
7173
pickle install uuid
7274

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

75-
# Install custom solr extension. Last release (2.4.0) is not working at all
76-
# with php72 and php73 and upstream has not either! Solution:
77-
# - current master (as of 21th May 2019):
78-
# https://github.com/php/pecl-search_engine-solr/commit/98a8bf540bcb4e9b2e1378cce2f3a9bf6cd772b8
79-
# - this patch, applied already upstream:
80-
# https://github.com/php/pecl-search_engine-solr/commit/744e32915d5989101267ed2c84a407c582dc6f31
81-
# So, following the experience with Macports, and https://bugs.php.net/bug.php?id=75631
82-
# we are going to try 2.4.0 release + macports patch. Old, but working right now.
83-
# References:
84-
# - https://github.com/moodlehq/moodle-php-apache/issues/16 (part of the php72 image discussion)
85-
# - https://github.com/moodlehq/moodle-php-apache/issues/19 (awaiting for a better solution)
86-
#/tmp/setup/solr-extension.sh -- not existing as of 8.0.0beta3
87-
8877
# Install Microsoft dependencies for sqlsrv.
8978
# (kept apart for clarity, still need to be run here
9079
# 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)