Skip to content

Commit

Permalink
Solr: Add support for ext:solr 5.1
Browse files Browse the repository at this point in the history
Add compatible solr config:
* solr server: 4.10.4
* schema: tx_solr-4-0-0--20160406
* solrconfig: tx_solr-4-0-0--20160406

Set newly added config as default solr container config and
add infos in the solr version matrix markdown file.

Resolves: webdevops#155
  • Loading branch information
josefglatz committed Jan 20, 2017
1 parent 84630f4 commit d63662c
Show file tree
Hide file tree
Showing 182 changed files with 17,632 additions and 4 deletions.
3 changes: 2 additions & 1 deletion docker-compose.cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ services:
# build:
# #context: docker/solr/ext-solr-3.0/
# #context: docker/solr/ext-solr-3.1/
# context: docker/solr/ext-solr-4.0-5.0/
# #context: docker/solr/ext-solr-4.0-5.0/
# context: docker/solr/ext-solr-5.1/
# restart: always
# volumes_from:
# - storage
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.development-reverse-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ services:
# build:
# #context: docker/solr/ext-solr-3.0/
# #context: docker/solr/ext-solr-3.1/
# context: docker/solr/ext-solr-4.0-5.0/
# #context: docker/solr/ext-solr-4.0-5.0/
# context: docker/solr/ext-solr-5.1/
# volumes_from:
# - storage
# env_file:
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ services:
# build:
# #context: docker/solr/ext-solr-3.0/
# #context: docker/solr/ext-solr-3.1/
# context: docker/solr/ext-solr-4.0-5.0/
# #context: docker/solr/ext-solr-4.0-5.0/
# context: docker/solr/ext-solr-5.1/
# ports:
# - 18983:8983
# volumes_from:
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ services:
# build:
# #context: docker/solr/ext-solr-3.0/
# #context: docker/solr/ext-solr-3.1/
# context: docker/solr/ext-solr-4.0-5.0/
# #context: docker/solr/ext-solr-4.0-5.0/
# context: docker/solr/ext-solr-5.1/
# ports:
# - 18983:8983
# restart: always
Expand Down
10 changes: 10 additions & 0 deletions docker/solr/TYPO3-SOLR-VERSION-MATRIX.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ You find the official version matrix "TYPO3 - Solr TYPO3 Extension - Solr Server



## EXT:solr 5.1 + TYPO3 7.6 + Solr Server 4.10.4

Make sure to use context `docker/solr/ext-solr-5.1/` in your `docker-compose.yml` like

solr:
build:
context: docker/solr/ext-solr-5.1/



## EXT:solr 5.0 + TYPO3 7.6 + Solr Server 4.10.4

Make sure to use context `docker/solr/ext-solr-4.0-5.0/` in your `docker-compose.yml` like
Expand Down
37 changes: 37 additions & 0 deletions docker/solr/ext-solr-5.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#++++++++++++++++++++++++++++++++++++++
# Solr Docker container
#++++++++++++++++++++++++++++++++++++++
#
# Images:
#
# guywithnose/solr
# https://hub.docker.com/r/guywithnose/solr/
#
#++++++++++++++++++++++++++++++++++++++

FROM guywithnose/solr:4.10.4
ENV DEBIAN_FRONTEND noninteractive

ADD entrypoint.sh /entrypoint.sh

COPY ./conf/ /opt/solr-conf/

# Download plugin
RUN curl -sf -o /tmp/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-1_3_0/solr-typo3-plugin-1.3.0.jar

# Init directories
RUN cp -a /opt/solr-conf/* /opt/solr/example/solr/ \
&& mkdir -p /opt/solr/example/solr/typo3cores/data \
&& mkdir -p /opt/solr/example/solr/typo3lib

# Add plugins
RUN mv /tmp/solr-typo3-plugin.jar /opt/solr/example/solr/typo3lib/ \
&& ln -s /opt/solr/contrib /opt/solr/example/solr/contrib

# Fix rights
RUN chown solr:solr -R /opt/solr/example/solr/

VOLUME "/storage"

ENTRYPOINT ["/entrypoint.sh"]
CMD ["solr"]
44 changes: 44 additions & 0 deletions docker/solr/ext-solr-5.1/conf/solr.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<solr persistent="true">
<cores adminPath="/admin/cores">
<core name="core_de" instanceDir="typo3cores" schema="german/schema.xml" dataDir="data/core_de" />
<core name="core_en" instanceDir="typo3cores" schema="english/schema.xml" dataDir="data/core_en" />

<!--
<core name="core_ar" instanceDir="typo3cores" schema="arabic/schema.xml" dataDir="data/core_ar" />
<core name="core_hy" instanceDir="typo3cores" schema="armenian/schema.xml" dataDir="data/core_hy" />
<core name="core_eu" instanceDir="typo3cores" schema="basque/schema.xml" dataDir="data/core_eu" />
<core name="core_ptbr" instanceDir="typo3cores" schema="brazilian_portuguese/schema.xml" dataDir="data/core_ptbr" />
<core name="core_bg" instanceDir="typo3cores" schema="bulgarian/schema.xml" dataDir="data/core_bg" />
<core name="core_my" instanceDir="typo3cores" schema="burmese/schema.xml" dataDir="data/core_my" />
<core name="core_ca" instanceDir="typo3cores" schema="catalan/schema.xml" dataDir="data/core_ca" />
<core name="core_zh" instanceDir="typo3cores" schema="chinese/schema.xml" dataDir="data/core_zh" />
<core name="core_cs" instanceDir="typo3cores" schema="czech/schema.xml" dataDir="data/core_cs" />
<core name="core_da" instanceDir="typo3cores" schema="danish/schema.xml" dataDir="data/core_da" />
<core name="core_nl" instanceDir="typo3cores" schema="dutch/schema.xml" dataDir="data/core_nl" />
<core name="core_fi" instanceDir="typo3cores" schema="finnish/schema.xml" dataDir="data/core_fi" />
<core name="core_fr" instanceDir="typo3cores" schema="french/schema.xml" dataDir="data/core_fr" />
<core name="core_gl" instanceDir="typo3cores" schema="galician/schema.xml" dataDir="data/core_gl" />
<core name="core_el" instanceDir="typo3cores" schema="greek/schema.xml" dataDir="data/core_el" />
<core name="core_hi" instanceDir="typo3cores" schema="hindi/schema.xml" dataDir="data/core_hi" />
<core name="core_hu" instanceDir="typo3cores" schema="hungarian/schema.xml" dataDir="data/core_hu" />
<core name="core_id" instanceDir="typo3cores" schema="indonesian/schema.xml" dataDir="data/core_id" />
<core name="core_it" instanceDir="typo3cores" schema="italian/schema.xml" dataDir="data/core_it" />
<core name="core_ja" instanceDir="typo3cores" schema="japanese/schema.xml" dataDir="data/core_ja" />
<core name="core_km" instanceDir="typo3cores" schema="khmer/schema.xml" dataDir="data/core_km" />
<core name="core_ko" instanceDir="typo3cores" schema="korean/schema.xml" dataDir="data/core_ko" />
<core name="core_lo" instanceDir="typo3cores" schema="lao/schema.xml" dataDir="data/core_lo" />
<core name="core_no" instanceDir="typo3cores" schema="norwegian/schema.xml" dataDir="data/core_no" />
<core name="core_fa" instanceDir="typo3cores" schema="persian/schema.xml" dataDir="data/core_fa" />
<core name="core_pl" instanceDir="typo3cores" schema="polish/schema.xml" dataDir="data/core_pl" />
<core name="core_pt" instanceDir="typo3cores" schema="portuguese/schema.xml" dataDir="data/core_pt" />
<core name="core_ro" instanceDir="typo3cores" schema="romanian/schema.xml" dataDir="data/core_ro" />
<core name="core_ru" instanceDir="typo3cores" schema="russian/schema.xml" dataDir="data/core_ru" />
<core name="core_es" instanceDir="typo3cores" schema="spanish/schema.xml" dataDir="data/core_es" />
<core name="core_sv" instanceDir="typo3cores" schema="swedish/schema.xml" dataDir="data/core_sv" />
<core name="core_th" instanceDir="typo3cores" schema="thai/schema.xml" dataDir="data/core_th" />
<core name="core_tr" instanceDir="typo3cores" schema="turkish/schema.xml" dataDir="data/core_tr" />
<core name="core_uk" instanceDir="typo3cores" schema="ukrainian/schema.xml" dataDir="data/core_uk" />
-->
</cores>
</solr>
14 changes: 14 additions & 0 deletions docker/solr/ext-solr-5.1/conf/typo3cores/conf/admin-extra.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!-- The content of this page will be statically included into the top
of the admin page. Uncomment this as an example to see there the content
will show up.
<hr>
<i>This line will appear before the first table</i>
<tr>
<td colspan="2">
This row will be appended to the end of the first table
</td>
</tr>
<hr>
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
{
"initArgs": {
"ignoreCase": true
},
"initializedOn": "2014-04-29T23:08:57.000Z",
"managedList": [
"من",
"ومن",
"منها",
"منه",
"في",
"وفي",
"فيها",
"فيه",
"و",
"ف",
"ثم",
"او",
"أو",
"ب",
"بها",
"به",
"ا",
"أ",
"اى",
"اي",
"أي",
"أى",
"لا",
"ولا",
"الا",
"ألا",
"إلا",
"لكن",
"ما",
"وما",
"كما",
"فما",
"عن",
"مع",
"اذا",
"إذا",
"ان",
"أن",
"إن",
"انها",
"أنها",
"إنها",
"انه",
"أنه",
"إنه",
"بان",
"بأن",
"فان",
"فأن",
"وان",
"وأن",
"وإن",
"التى",
"التي",
"الذى",
"الذي",
"الذين",
"الى",
"الي",
"إلى",
"إلي",
"على",
"عليها",
"عليه",
"اما",
"أما",
"إما",
"ايضا",
"أيضا",
"كل",
"وكل",
"لم",
"ولم",
"لن",
"ولن",
"هى",
"هي",
"هو",
"وهى",
"وهي",
"وهو",
"فهى",
"فهي",
"فهو",
"انت",
"أنت",
"لك",
"لها",
"له",
"هذه",
"هذا",
"تلك",
"ذلك",
"هناك",
"كانت",
"كان",
"يكون",
"تكون",
"وكانت",
"وكان",
"غير",
"بعض",
"قد",
"نحو",
"بين",
"بينما",
"منذ",
"ضمن",
"حيث",
"الان",
"الآن",
"خلال",
"بعد",
"قبل",
"حتى",
"عند",
"عندما",
"لدى",
"جميع"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TYPO3
Loading

0 comments on commit d63662c

Please sign in to comment.