From 7fa01c75910b780fd8711559488dacaf98c88547 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Mon, 17 Nov 2025 17:51:20 +1100 Subject: [PATCH] [#2089] Updated Solr to v9. --- .docker/config/solr/config-set/accents_et.txt | 185 ++ .docker/config/solr/config-set/nouns_et.txt | 1 + .../config/solr/config-set/protwords_et.txt | 1 + .docker/config/solr/config-set/schema.xml | 79 +- .../solr/config-set/schema_extra_fields.xml | 7 + .../solr/config-set/schema_extra_types.xml | 71 +- .docker/config/solr/config-set/solrconfig.xml | 98 +- .../solr/config-set/solrconfig_extra.xml | 27 + .../solr/config-set/solrconfig_query.xml | 26 +- .../solr/config-set/solrcore.properties | 4 +- .../config/solr/config-set/stopwords_et.txt | 1602 +++++++++++++++++ .../config/solr/config-set/synonyms_et.txt | 1 + .docker/solr.dockerfile | 7 +- .vortex/CLAUDE.md | 22 + .../docs/content/getting-started/features.mdx | 2 +- .vortex/docs/content/tools/docker.mdx | 14 +- .../docs/content/workflows/notifications.mdx | 1 - .vortex/docs/cspell.json | 4 +- .../config/solr/config-set/accents_et.txt | 1 + .../config/solr/config-set/nouns_et.txt | 1 + .../config/solr/config-set/protwords_et.txt | 1 + .../config/solr/config-set/stopwords_et.txt | 1 + .../config/solr/config-set/synonyms_et.txt | 1 + .../install/_baseline/.docker/solr.dockerfile | 7 +- .../config/solr/config-set/-accents_et.txt | 0 .../config/solr/config-set/-nouns_et.txt | 0 .../config/solr/config-set/-protwords_et.txt | 0 .../config/solr/config-set/-stopwords_et.txt | 0 .../config/solr/config-set/-synonyms_et.txt | 0 .../config/solr/config-set/-accents_et.txt | 0 .../config/solr/config-set/-nouns_et.txt | 0 .../config/solr/config-set/-protwords_et.txt | 0 .../config/solr/config-set/-stopwords_et.txt | 0 .../config/solr/config-set/-synonyms_et.txt | 0 34 files changed, 2069 insertions(+), 95 deletions(-) create mode 100644 .docker/config/solr/config-set/accents_et.txt create mode 100644 .docker/config/solr/config-set/nouns_et.txt create mode 100644 .docker/config/solr/config-set/protwords_et.txt create mode 100644 .docker/config/solr/config-set/stopwords_et.txt create mode 100644 .docker/config/solr/config-set/synonyms_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/accents_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/nouns_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/protwords_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/stopwords_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/synonyms_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-accents_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-nouns_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-protwords_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-stopwords_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-synonyms_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-accents_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-nouns_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-protwords_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-stopwords_et.txt create mode 100644 .vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-synonyms_et.txt diff --git a/.docker/config/solr/config-set/accents_et.txt b/.docker/config/solr/config-set/accents_et.txt new file mode 100644 index 000000000..a1bd62aa9 --- /dev/null +++ b/.docker/config/solr/config-set/accents_et.txt @@ -0,0 +1,185 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +#"\u00C4" => "A" +# Å => A +#"\u00C5" => "A" +# Ą => A +"\u0104" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# Ć => C +"\U0106" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ę => E +"\u0118" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ł => L +"\u0141" => "L" +# Ñ => N +"\u00D1" => "N" +# Ń => N +"\u0143" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +#"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +#"\u00E4" => "a" +# å => a +#"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +#"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# Ś => S +"\u015a" => "S" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# Ź => Z +"\u0179" => "Z" +# Ż => Z +"\u017b" => "Z" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" +# Māori macrons. +# Ā => A +"\u0100" => "A" +# Ē => E +"\u0112" => "E" +# Ī => I +"\u012A" => "I" +# Ō => O +"\u014C" => "O" +# Ū => U +"\u016A" => "U" +# ā => a +"\u0101" => "a" +# ē => e +"\u0113" => "e" +# ī => i +"\u012B" => "i" +# ō => o +"\u014D" => "o" +# ū => u +"\u016B" => "u" diff --git a/.docker/config/solr/config-set/nouns_et.txt b/.docker/config/solr/config-set/nouns_et.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/.docker/config/solr/config-set/nouns_et.txt @@ -0,0 +1 @@ + diff --git a/.docker/config/solr/config-set/protwords_et.txt b/.docker/config/solr/config-set/protwords_et.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/.docker/config/solr/config-set/protwords_et.txt @@ -0,0 +1 @@ + diff --git a/.docker/config/solr/config-set/schema.xml b/.docker/config/solr/config-set/schema.xml index 3c7311dbf..290788a06 100644 --- a/.docker/config/solr/config-set/schema.xml +++ b/.docker/config/solr/config-set/schema.xml @@ -30,7 +30,7 @@ It should be kept correct and concise, usable out-of-the-box. For more information, on how to customize this file, please see - http://wiki.apache.org/solr/SchemaXml + https://solr.apache.org/guide/solr/latest/indexing-guide/schema-elements.html PERFORMANCE NOTE: this schema includes many optional features and should not be used for benchmarking. To improve performance one could @@ -49,7 +49,7 @@ that avoids logging every request --> - + - + + + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -267,9 +269,11 @@ single-valued and either required or have a default value. --> + + + @@ -372,7 +377,7 @@ --> - + diff --git a/.docker/config/solr/config-set/schema_extra_fields.xml b/.docker/config/solr/config-set/schema_extra_fields.xml index 89675ffcd..abf8dbe05 100644 --- a/.docker/config/solr/config-set/schema_extra_fields.xml +++ b/.docker/config/solr/config-set/schema_extra_fields.xml @@ -78,6 +78,13 @@ + + + + + + + diff --git a/.docker/config/solr/config-set/schema_extra_types.xml b/.docker/config/solr/config-set/schema_extra_types.xml index 9e0b7265f..4a6ce5596 100644 --- a/.docker/config/solr/config-set/schema_extra_types.xml +++ b/.docker/config/solr/config-set/schema_extra_types.xml @@ -483,6 +483,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2390,7 +2451,7 @@ - + @@ -2399,18 +2460,18 @@ - + diff --git a/.docker/config/solr/config-set/solrconfig.xml b/.docker/config/solr/config-set/solrconfig.xml index a2a9fd71f..a30024f9c 100644 --- a/.docker/config/solr/config-set/solrconfig.xml +++ b/.docker/config/solr/config-set/solrconfig.xml @@ -9,9 +9,9 @@ - + - ${solr.luceneMatchVersion:LUCENE_80} + ${solr.luceneMatchVersion:LUCENE_90} - + + - - + + - - + + - - - + + @@ -223,7 +229,7 @@ 'simple' is the default More details on the nuances of each LockFactory... - http://wiki.apache.org/lucene-java/AvailableLockFactories + https://cwiki.apache.org/confluence/display/lucene/AvailableLockFactories --> ${solr.lock.type:native} @@ -284,6 +290,7 @@ solr data directory. --> ${solr.ulog.dir:} + ${solr.ulog.numVersionBuckets:65536} + + + + + + + + - - - 5 - - - + - + - + - + - + true false 20 200 diff --git a/.docker/config/solr/config-set/solrcore.properties b/.docker/config/solr/config-set/solrcore.properties index bea273138..09819c65a 100644 --- a/.docker/config/solr/config-set/solrcore.properties +++ b/.docker/config/solr/config-set/solrcore.properties @@ -2,7 +2,7 @@ solr.replication.master=false solr.replication.slave=false solr.replication.pollInterval=00:00:60 solr.replication.masterUrl=http://localhost:8983/solr -solr.replication.confFiles=schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml,stopwords_ar.txt,synonyms_ar.txt,nouns_ar.txt,protwords_ar.txt,accents_ar.txt,stopwords_bg.txt,synonyms_bg.txt,nouns_bg.txt,protwords_bg.txt,accents_bg.txt,stopwords_ca.txt,synonyms_ca.txt,nouns_ca.txt,protwords_ca.txt,accents_ca.txt,stopwords_hr.txt,synonyms_hr.txt,protwords_hr.txt,accents_hr.txt,stopwords_cs.txt,synonyms_cs.txt,protwords_cs.txt,accents_cs.txt,stopwords_da.txt,synonyms_da.txt,nouns_da.txt,protwords_da.txt,accents_da.txt,stopwords_nl.txt,synonyms_nl.txt,nouns_nl.txt,protwords_nl.txt,accents_nl.txt,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_fi.txt,synonyms_fi.txt,nouns_fi.txt,protwords_fi.txt,accents_fi.txt,stopwords_fr.txt,synonyms_fr.txt,nouns_fr.txt,protwords_fr.txt,accents_fr.txt,stopwords_de.txt,nouns_de.txt,protwords_de.txt,synonyms_de.txt,accents_de.txt,stopwords_el.txt,synonyms_el.txt,nouns_el.txt,protwords_el.txt,accents_el.txt,stopwords_hi.txt,synonyms_hi.txt,nouns_hi.txt,protwords_hi.txt,accents_hi.txt,stopwords_hu.txt,synonyms_hu.txt,protwords_hu.txt,accents_hu.txt,stopwords_id.txt,synonyms_id.txt,protwords_id.txt,accents_id.txt,stopwords_ga.txt,synonyms_ga.txt,protwords_ga.txt,accents_ga.txt,stopwords_it.txt,synonyms_it.txt,nouns_it.txt,protwords_it.txt,accents_it.txt,stoptags_ja.txt,stopwords_ja.txt,stopwords_ko.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt,stopwords_lv.txt,synonyms_lv.txt,protwords_lv.txt,accents_lv.txt,stopwords_nb.txt,synonyms_nb.txt,nouns_nb.txt,protwords_nb.txt,accents_nb.txt,stopwords_nn.txt,synonyms_nn.txt,nouns_nn.txt,protwords_nn.txt,accents_nn.txt,stopwords_fa.txt,synonyms_fa.txt,nouns_fa.txt,protwords_fa.txt,accents_fa.txt,stopwords_pl.txt,synonyms_pl.txt,nouns_pl.txt,protwords_pl.txt,accents_pl.txt,stopwords_pt_br.txt,synonyms_pt_br.txt,nouns_pt_br.txt,protwords_pt_br.txt,accents_pt_br.txt,stopwords_pt_pt.txt,synonyms_pt_pt.txt,nouns_pt_pt.txt,protwords_pt_pt.txt,accents_pt_pt.txt,stopwords_ro.txt,synonyms_ro.txt,nouns_ro.txt,protwords_ro.txt,accents_ro.txt,stopwords_ru.txt,synonyms_ru.txt,nouns_ru.txt,protwords_ru.txt,accents_ru.txt,stopwords_sr.txt,synonyms_sr.txt,protwords_sr.txt,accents_sr.txt,stopwords_sk.txt,synonyms_sk.txt,protwords_sk.txt,accents_sk.txt,stopwords_es.txt,synonyms_es.txt,nouns_es.txt,protwords_es.txt,accents_es.txt,stopwords_sv.txt,synonyms_sv.txt,nouns_sv.txt,protwords_sv.txt,accents_sv.txt,stopwords_th.txt,synonyms_th.txt,nouns_th.txt,protwords_th.txt,accents_th.txt,stopwords_tr.txt,synonyms_tr.txt,nouns_tr.txt,protwords_tr.txt,accents_tr.txt,stopwords_uk.txt,synonyms_uk.txt,nouns_uk.txt,protwords_uk.txt,accents_uk.txt,stopwords_cy.txt,synonyms_cy.txt,nouns_cy.txt,protwords_cy.txt,accents_cy.txt +solr.replication.confFiles=schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml,stopwords_ar.txt,synonyms_ar.txt,nouns_ar.txt,protwords_ar.txt,accents_ar.txt,stopwords_bg.txt,synonyms_bg.txt,nouns_bg.txt,protwords_bg.txt,accents_bg.txt,stopwords_ca.txt,synonyms_ca.txt,nouns_ca.txt,protwords_ca.txt,accents_ca.txt,stopwords_hr.txt,synonyms_hr.txt,protwords_hr.txt,accents_hr.txt,stopwords_cs.txt,synonyms_cs.txt,protwords_cs.txt,accents_cs.txt,stopwords_da.txt,synonyms_da.txt,nouns_da.txt,protwords_da.txt,accents_da.txt,stopwords_nl.txt,synonyms_nl.txt,nouns_nl.txt,protwords_nl.txt,accents_nl.txt,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_et.txt,synonyms_et.txt,nouns_et.txt,protwords_et.txt,accents_et.txt,stopwords_fi.txt,synonyms_fi.txt,nouns_fi.txt,protwords_fi.txt,accents_fi.txt,stopwords_fr.txt,synonyms_fr.txt,nouns_fr.txt,protwords_fr.txt,accents_fr.txt,stopwords_de.txt,nouns_de.txt,protwords_de.txt,synonyms_de.txt,accents_de.txt,stopwords_el.txt,synonyms_el.txt,nouns_el.txt,protwords_el.txt,accents_el.txt,stopwords_hi.txt,synonyms_hi.txt,nouns_hi.txt,protwords_hi.txt,accents_hi.txt,stopwords_hu.txt,synonyms_hu.txt,protwords_hu.txt,accents_hu.txt,stopwords_id.txt,synonyms_id.txt,protwords_id.txt,accents_id.txt,stopwords_ga.txt,synonyms_ga.txt,protwords_ga.txt,accents_ga.txt,stopwords_it.txt,synonyms_it.txt,nouns_it.txt,protwords_it.txt,accents_it.txt,stoptags_ja.txt,stopwords_ja.txt,stopwords_ko.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt,stopwords_lv.txt,synonyms_lv.txt,protwords_lv.txt,accents_lv.txt,stopwords_nb.txt,synonyms_nb.txt,nouns_nb.txt,protwords_nb.txt,accents_nb.txt,stopwords_nn.txt,synonyms_nn.txt,nouns_nn.txt,protwords_nn.txt,accents_nn.txt,stopwords_fa.txt,synonyms_fa.txt,nouns_fa.txt,protwords_fa.txt,accents_fa.txt,stopwords_pl.txt,synonyms_pl.txt,nouns_pl.txt,protwords_pl.txt,accents_pl.txt,stopwords_pt_br.txt,synonyms_pt_br.txt,nouns_pt_br.txt,protwords_pt_br.txt,accents_pt_br.txt,stopwords_pt_pt.txt,synonyms_pt_pt.txt,nouns_pt_pt.txt,protwords_pt_pt.txt,accents_pt_pt.txt,stopwords_ro.txt,synonyms_ro.txt,nouns_ro.txt,protwords_ro.txt,accents_ro.txt,stopwords_ru.txt,synonyms_ru.txt,nouns_ru.txt,protwords_ru.txt,accents_ru.txt,stopwords_sr.txt,synonyms_sr.txt,protwords_sr.txt,accents_sr.txt,stopwords_sk.txt,synonyms_sk.txt,protwords_sk.txt,accents_sk.txt,stopwords_es.txt,synonyms_es.txt,nouns_es.txt,protwords_es.txt,accents_es.txt,stopwords_sv.txt,synonyms_sv.txt,nouns_sv.txt,protwords_sv.txt,accents_sv.txt,stopwords_th.txt,synonyms_th.txt,nouns_th.txt,protwords_th.txt,accents_th.txt,stopwords_tr.txt,synonyms_tr.txt,nouns_tr.txt,protwords_tr.txt,accents_tr.txt,stopwords_uk.txt,synonyms_uk.txt,nouns_uk.txt,protwords_uk.txt,accents_uk.txt,stopwords_cy.txt,synonyms_cy.txt,nouns_cy.txt,protwords_cy.txt,accents_cy.txt solr.mlt.timeAllowed=2000 solr.selectSearchHandler.timeAllowed=-1 solr.autoCommit.MaxDocs=-1 @@ -10,4 +10,4 @@ solr.autoCommit.MaxTime=15000 solr.autoSoftCommit.MaxDocs=-1 solr.autoSoftCommit.MaxTime=5000 -solr.luceneMatchVersion=8.0 +solr.luceneMatchVersion=9.10.0 diff --git a/.docker/config/solr/config-set/stopwords_et.txt b/.docker/config/solr/config-set/stopwords_et.txt new file mode 100644 index 000000000..fbf275dfd --- /dev/null +++ b/.docker/config/solr/config-set/stopwords_et.txt @@ -0,0 +1,1602 @@ +all +alla +allapoole +allpool +alt +altpoolt +eel +eespool +enne +hommikupoole +hoolimata +ilma +kaudu +keset +kesk +kohe +koos +kuhupoole +kuni +kuspool +kustpoolt +kõige +käsikäes +lappi +ligi +läbi +mööda +paitsi +peale +pealepoole +pealpool +pealt +pealtpoolt +piki +pikku +piku +pikuti +põiki +pärast +päri +risti +sealpool +sealtpoolt +seespool +seltsis +siiapoole +siinpool +siitpoolt +sinnapoole +sissepoole +taga +tagantpoolt +tagapidi +tagapool +taha +tahapoole +teispool +teispoole +tänu +tükkis +vaatamata +vastu +väljapoole +väljaspool +väljastpoolt +õhtupoole +ühes +ühestükis +ühestükkis +ülalpool +ülaltpoolt +üle +ülespoole +ülevalpool +ülevaltpoolt +ümber +ümbert +aegu +aegus +alguks +algul +algule +algult +alguni +all +alla +alt +alul +alutsi +arvel +asemel +asemele +eel +eeli +ees +eesotsas +eest +eestotsast +esitsi +ette +etteotsa +haaval +heaks +hoolimata +hulgas +hulgast +hulka +jalgu +jalus +jalust +jaoks +jooksul +juurde +juures +juurest +jälil +jälile +järel +järele +järelt +järgi +kaasas +kallal +kallale +kallalt +kamul +kannul +kannule +kannult +kaudu +kaupa +keskel +keskele +keskelt +keskis +keskpaiku +kestel +kestes +kilda +killas +killast +kimpu +kimpus +kiuste +kohal +kohale +kohalt +kohaselt +kohe +kohta +koos +korral +kukil +kukile +kukilt +kulul +kõrva +kõrval +kõrvale +kõrvalt +kõrvas +kõrvast +käekõrval +käekõrvale +käekõrvalt +käes +käest +kätte +külge +küljes +küljest +küüsi +küüsis +küüsist +ligi +ligidal +ligidale +ligidalt +aegu +aegus +alguks +algul +algule +algult +alguni +all +alla +alt +alul +alutsi +arvel +asemel +asemele +eel +eeli +ees +eesotsas +eest +eestotsast +esitsi +ette +etteotsa +haaval +heaks +hoolimata +hulgas +hulgast +hulka +jalgu +jalus +jalust +jaoks +jooksul +juurde +juures +juurest +jälil +jälile +järel +järele +järelt +järgi +kaasas +kallal +kallale +kallalt +kamul +kannul +kannule +kannult +kaudu +kaupa +keskel +keskele +keskelt +keskis +keskpaiku +kestel +kestes +kilda +killas +killast +kimpu +kimpus +kiuste +kohal +kohale +kohalt +kohaselt +kohe +kohta +koos +korral +kukil +kukile +kukilt +kulul +kõrva +kõrval +kõrvale +kõrvalt +kõrvas +kõrvast +käekõrval +käekõrvale +käekõrvalt +käes +käest +kätte +külge +küljes +küljest +küüsi +küüsis +küüsist +ligi +ligidal +ligidale +ligidalt +lool +läbi +lähedal +lähedale +lähedalt +man +mant +manu +meelest +mööda +nahas +nahka +nahkas +najal +najale +najalt +nõjal +nõjale +otsa +otsas +otsast +paigale +paigu +paiku +peal +peale +pealt +perra +perrä +pidi +pihta +piki +pikku +pool +poole +poolest +poolt +puhul +puksiiris +pähe +päralt +päras +pärast +päri +ringi +ringis +risust +saadetusel +saadik +saatel +saati +seas +seast +sees +seest +sekka +seljataga +seltsi +seltsis +seltsist +sisse +slepis +suhtes +šlepis +taga +tagant +tagantotsast +tagaotsas +tagaselja +tagasi +tagast +tagutsi +taha +tahaotsa +takka +tarvis +tasa +tuuri +tuuris +tõttu +tükkis +uhal +vaatamata +vahel +vahele +vahelt +vahepeal +vahepeale +vahepealt +vahetsi +varal +varale +varul +vastas +vastast +vastu +veerde +veeres +viisi +võidu +võrd +võrdki +võrra +võrragi +väel +väele +vältel +väärt +väärtki +äärde +ääre +ääres +äärest +ühes +üle +ümber +ümbert +a +abil +aina +ainult +alalt +alates +alati +alles +b +c +d +e +eales +ealeski +edasi +edaspidi +eelkõige +eemal +ei +eks +end +enda +enese +ennem +esialgu +f +g +h +hoopis +i +iganes +igatahes +igati +iial +iialgi +ikka +ikkagi +ilmaski +iseenda +iseenese +iseenesest +isegi +j +jah +ju +juba +juhul +just +järelikult +k +ka +kah +kas +kasvõi +keda +kestahes +kogu +koguni +kohati +kokku +kuhu +kuhugi +kuidagi +kuidas +kunagi +kus +kusagil +kusjuures +kuskil +kust +kõigepealt +küll +l +liiga +lisaks +m +miks +mil +millal +millalgi +mispärast +mistahes +mistõttu +mitte +muide +muidu +muidugi +muist +mujal +mujale +mujalt +mõlemad +mõnda +mõne +mõnikord +n +nii +niikaua +niimoodi +niipaljuke +niisama +niisiis +niivõrd +nõnda +nüüd +o +omaette +omakorda +omavahel +ometi +p +palju +paljuke +palju-palju +peaaegu +peagi +peamiselt +pigem +pisut +praegu +päris +r +rohkem +s +samas +samuti +seal +sealt +sedakorda +sedapuhku +seega +seejuures +seejärel +seekord +seepärast +seetõttu +sellepärast +seni +sestap +siia +siiani +siin +siinkohal +siis +siiski +siit +sinna +suht +š +z +ž +t +teel +teineteise +tõesti +täiesti +u +umbes +v +w +veel +veelgi +vist +võibolla +võib-olla +väga +vähemalt +välja +väljas +väljast +õ +ä +ära +ö +ü +ühtlasi +üksi +ükskõik +ülal +ülale +ülalt +üles +ülesse +üleval +ülevalt +ülimalt +üsna +x +y +aga +ega +ehk +ehkki +elik +ellik +enge +ennegu +ent +et +ja +justkui +kui +kuid +kuigi +kuivõrd +kuna +kuni +kut +mistab +muudkui +nagu +nigu +ning +olgugi +otsekui +otsenagu +selmet +sest +sestab +vaid +või +aa +adaa +adjöö +ae +ah +ahaa +ahah +ah-ah-ah +ah-haa +ahoi +ai +aidaa +aidu-raidu +aih +aijeh +aituma +aitäh +aitüma +ammuu +amps +ampsti +aptsih +ass +at +ata +at-at-at +atsih +atsihh +auh +bai-bai +bingo +braavo +brr +ee +eeh +eh +ehee +eheh +eh-eh-hee +eh-eh-ee +ehei +ehh +ehhee +einoh +ena +ennäe +ennäh +fuh +fui +fuih +haa +hah +hahaa +hah-hah-hah +halleluuja +hallo +halloo +hass +hee +heh +he-he-hee +hei +heldeke(ne) +heureka +hihii +hip-hip-hurraa +hmh +hmjah +hoh-hoh-hoo +hohoo +hoi +hollallaa +hoo +hoplaa +hopp +hops +hopsassaa +hopsti +hosianna +huh +huidii +huist +hurjah +hurjeh +hurjoh +hurjuh +hurraa +huu +hõhõh +hõi +hõissa +hõissassa +hõk +hõkk +häh +hä-hä-hää +hüvasti +ih-ah-haa +ih-ih-hii +ii-ha-ha +issake +issakene +isver +jaa-ah +ja-ah +jaah +janäe +jeeh +jeerum +jeever +jessas +jestas +juhhei +jumalaga +jumalime +jumaluke +jumalukene +jutas +kaaps +kaapsti +kaasike +kae +kalps +kalpsti +kannäe +kanäe +kappadi +kaps +kapsti +karkõmm +karkäuh +karkääks +karkääksti +karmauh +karmauhti +karnaps +karnapsti +karniuhti +karpartsaki +karpauh +karpauhti +karplauh +karplauhti +karprauh +karprauhti +karsumdi +karsumm +kartsumdi +kartsumm +karviuh +karviuhti +kaske +kassa +kauh +kauhti +keh +keksti +kepsti +khe +khm +kih +kiiks +kiiksti +kiis +kiiss +kikerii +kikerikii +kili +kilk +kilk-kõlk +kilks +kilks-kolks +kilks-kõlks +kill +killadi +killadi|-kolladi +killadi-kõlladi +killa-kolla +killa-kõlla +kill-kõll +kimps-komps +kipp +kips-kõps +kiriküüt +kirra-kõrra +kirr-kõrr +kirts +klaps +klapsti +klirdi +klirr +klonks +klops +klopsti +kluk +klu-kluu +klõks +klõksti +klõmdi +klõmm +klõmpsti +klõnks +klõnksti +klõps +klõpsti +kläu +kohva-kohva +kok +koks +koksti +kolaki +kolk +kolks +kolksti +koll +kolladi +komp +komps +kompsti +kop +kopp +koppadi +kops +kopsti +kossu +kotsu +kraa +kraak +kraaks +kraaps +kraapsti +krahh +kraks +kraksti +kraps +krapsti +krauh +krauhti +kriiks +kriiksti +kriips +kriips-kraaps +kripa-krõpa +krips-kraps +kriuh +kriuks +kriuksti +kromps +kronk +kronks +krooks +kruu +krõks +krõksti +krõpa +krõps +krõpsti +krõuh +kräu +kräuh +kräuhti +kräuks +kss +kukeleegu +kukku +kuku +kulu +kurluu +kurnäu +kuss +kussu +kõks +kõksti +kõldi +kõlks +kõlksti +kõll +kõmaki +kõmdi +kõmm +kõmps +kõpp +kõps +kõpsadi +kõpsat +kõpsti +kõrr +kõrra-kõrra +kõss +kõtt +kõõksti +kärr +kärts +kärtsti +käuks +käuksti +kääga +kääks +kääksti +köh +köki-möki +köksti +laks +laksti +lampsti +larts +lartsti +lats +latsti +leelo +legoo +lehva +liiri-lõõri +lika-lõka +likat-lõkat +limpsti +lips +lipsti +lirts +lirtsaki +lirtsti +lonksti +lops +lopsti +lorts +lortsti +luks +lups +lupsti +lurts +lurtsti +lõks +lõksti +lõmps +lõmpsti +lõnks +lõnksti +lärts +lärtsti +läts +lätsti +lörts +lörtsti +lötsti +lööps +lööpsti +marss +mats +matsti +mauh +mauhti +mh +mhh +mhmh +miau +mjaa +mkm +m-mh +mnjaa +mnjah +moens +mulks +mulksti +mull-mull +mull-mull-mull +muu +muuh +mõh +mõmm +mäh +mäts +mäu +mää +möh +möh-öh-ää +möö +müh-müh +mühüh +müks +müksti +müraki +mürr +mürts +mürtsaki +mürtsti +mütaku +müta-mäta +müta-müta +müt-müt +müt-müt-müt +müts +mütsti +mütt +naa +naah +nah +naks +naksti +nanuu +naps +napsti +nilpsti +nipsti +nirr +niuh +niuh-näuh +niuhti +noh +noksti +nolpsti +nonoh +nonoo +nonäh +noo +nooh +nooks +norr +nurr +nuuts +nõh +nõhh +nõka-nõka +nõks +nõksat-nõksat +nõks-nõks +nõksti +nõõ +nõõh +näeh +näh +nälpsti +nämm-nämm +näpsti +näts +nätsti +näu +näuh +näuhti +näuks +näuksti +nääh +nääks +nühkat-nühkat +oeh +oh +ohh +ohhh +oh-hoi +oh-hoo +ohoh +oh-oh-oo +oh-oh-hoo +ohoi +ohoo +oi +oih +oijee +oijeh +oo +ooh +oo-oh +oo-ohh +oot +ossa +ot +paa +pah +pahh +pakaa +pamm +pantsti +pardon +pardonks +parlartsti +parts +partsti +partsumdi +partsumm +pastoi +pats +patst +patsti +pau +pauh +pauhti +pele +pfui +phuh +phuuh +phäh +phähh +piiks +piip +piiri-pääri +pimm +pimm-pamm +pimm-pomm +pimm-põmm +piraki +piuks +piu-pau +plaks +plaksti +plarts +plartsti +plats +platsti +plauh +plauhh +plauhti +pliks +pliks-plaks +plinn +pliraki +plirts +plirtsti +pliu +pliuh +ploks +plotsti +plumps +plumpsti +plõks +plõksti +plõmdi +plõmm +plõnn +plärr +plärts +plärtsat +plärtsti +pläu +pläuh +plää +plörtsat +pomm +popp +pops +popsti +ports +pot +pots +potsti +pott +praks +praksti +prants +prantsaki +prantsti +prassai +prauh +prauhh +prauhti +priks +priuh +priuhh +priuh-prauh +proosit +proost +prr +prrr +prõks +prõksti +prõmdi +prõmm +prõntsti +prääk +prääks +pst +psst +ptrr +ptruu +ptüi +puh +puhh +puksti +pumm +pumps +pup-pup-pup +purts +puuh +põks +põksti +põmdi +põmm +põmmadi +põnks +põnn +põnnadi +põnt +põnts +põntsti +põraki +põrr +põrra-põrra +päh +pähh +päntsti +pää +pöörd +püh +raks +raksti +raps +rapsti +ratataa +rauh +riips +riipsti +riks +riks-raks +rips-raps +rivitult +robaki +rops +ropsaki +ropsti +ruik +räntsti +räts +röh +röhh +sah +sahh +sahkat +saps +sapsti +sauh +sauhti +servus +sihkadi-sahkadi +sihka-sahka +sihkat-sahkat +silks +silk-solk +sips +sipsti +sirr +sirr-sorr +sirts +sirtsti +siu +siuh +siuh-sauh +siuh-säuh +siuhti +siuks +siuts +skool +so +soh +solks +solksti +solpsti +soo +sooh +so-oh +soo-oh +sopp +sops +sopsti +sorr +sorts +sortsti +so-soo +soss +soss-soss +ss +sss +sst +stopp +suhkat-sahkat +sulk +sulks +sulksti +sull +sulla-sulla +sulpa-sulpa +sulps +sulpsti +sumaki +sumdi +summ +summat-summat +sups +supsaku +supsti +surts +surtsti +suss +susti +suts +sutsti +säh +sähke +särts +särtsti +säu +säuh +säuhti +taevake +taevakene +takk +tere +terekest +tibi-tibi +tikk-takk +tiks +tilk +tilks +till +tilla-talla +till-tall +tilulii +tinn +tip +tip-tap +tirr +tirtsti +tiu +tjaa +tjah +tohhoh +tohhoo +tohoh +tohoo +tok +tokk +toks +toksti +tonks +tonksti +tota +totsti +tot-tot +tprr +tpruu +trah +trahh +trallallaa +trill +trillallaa +trr +trrr +tsah +tsahh +tsilk +tsilk-tsolk +tsirr +tsiuh +tskae +tsolk +tss +tst +tsst +tsuhh +tsuk +tsumm +tsurr +tsäuh +tšao +tšš +tššš +tuk +tuks +turts +turtsti +tutki +tutkit +tutu-lutu +tutulutu +tuut +tuutu-luutu +tõks +tötsti +tümps +uh +uhh +uh-huu +uhtsa +uhtsaa +uhuh +uhuu +ui +uih +uih-aih +uijah +uijeh +uist +uit +uka +upsti +uraa +urjah +urjeh +urjoh +urjuh +urr +urraa +ust +utu +uu +uuh +vaak +vaat +vae +vaeh +vai +vat +vau +vhüüt +vidiit +viiks +vilks +vilksti +vinki-vinki +virdi +virr +viu +viudi +viuh +viuhti +voeh +voh +vohh +volks +volksti +vooh +vops +vopsti +vot +vuh +vuhti +vuih +vulks +vulksti +vull +vulpsti +vups +vupsaki +vupsaku +vupsti +vurdi +vurr +vurra-vurra +vurts +vurtsti +vutt +võe +võeh +või +võih +võrr +võts +võtt +vääks +õe +õits +õk +õkk +õrr +õss +õuh +äh +ähh +ähhähhää +äh-hää +äh-äh-hää +äiu +äiu-ää +äss +ää +ääh +äähh +öh +öhh +ök +üh +eelmine +eikeegi +eimiski +emb-kumb +enam +enim +iga +igasugune +igaüks +ise +isesugune +järgmine +keegi +kes +kumb +kumbki +kõik +meiesugune +meietaoline +midagi +mihuke +mihukene +milletaoline +milline +mina +minake +mingi +mingisugune +minusugune +minutaoline +mis +miski +miskisugune +missugune +misuke +mitmes +mitmesugune +mitu +mitu-mitu +mitu-setu +muu +mõlema +mõnesugune +mõni +mõningane +mõningas +mäherdune +määrane +naasugune +need +nemad +nendesugune +nendetaoline +nihuke +nihukene +niimitu +niisamasugune +niisugune +nisuke +nisukene +oma +omaenese +omasugune +omataoline +pool +praegune +sama +samasugune +samataoline +see +seesama +seesamane +seesamune +seesinane +seesugune +selline +sihuke +sihukene +sina +sinusugune +sinutaoline +siuke +siukene +säherdune +säärane +taoline +teiesugune +teine +teistsugune +tema +temake +temakene +temasugune +temataoline +too +toosama +toosamane +üks +üksteise +hakkama +minema +olema +pidama +saama +tegema +tulema +võima diff --git a/.docker/config/solr/config-set/synonyms_et.txt b/.docker/config/solr/config-set/synonyms_et.txt new file mode 100644 index 000000000..91689ff92 --- /dev/null +++ b/.docker/config/solr/config-set/synonyms_et.txt @@ -0,0 +1 @@ +drupal, durpal diff --git a/.docker/solr.dockerfile b/.docker/solr.dockerfile index 8e1ba03f0..8707a02d4 100644 --- a/.docker/solr.dockerfile +++ b/.docker/solr.dockerfile @@ -2,10 +2,10 @@ # # hadolint global ignore=DL3018 # -# @see https://hub.docker.com/r/uselagoon/solr-8/tags -# @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr/8.Dockerfile +# @see https://hub.docker.com/r/uselagoon/solr-9-drupal/tags +# @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/9.Dockerfile -FROM uselagoon/solr-8:25.9.0 +FROM uselagoon/solr-9-drupal:25.10.0 # Solr jump-start config needs to be manually copied from the search_api_solr # Drupal module to .docker/config/solr/config-set. @@ -13,6 +13,7 @@ COPY .docker/config/solr/config-set /solr-conf/conf/ USER root +# Apply custom modifications for Lagoon environment compatibility. RUN sed -i -e "s#\${solr.data.dir:}#/var/solr/\${solr.core.name}#g" /solr-conf/conf/solrconfig.xml && \ sed -i -e "s#solr.lock.type:native#solr.lock.type:none#g" /solr-conf/conf/solrconfig.xml && \ sed -i -e "s#solr.autoSoftCommit.MaxTime=5000#solr.autoSoftCommit.MaxTime=-1#g" /solr-conf/conf/solrcore.properties diff --git a/.vortex/CLAUDE.md b/.vortex/CLAUDE.md index 1338f16ec..60a3bbcd2 100644 --- a/.vortex/CLAUDE.md +++ b/.vortex/CLAUDE.md @@ -1497,6 +1497,28 @@ $this->cmd('ahoy export-db', '! Containers are not running.', arg: $args); ## Important AI Assistant Guidelines +### CRITICAL: Commands That Require User Permission + +**NEVER run these commands without explicit user permission:** + +- `ahoy update-fixtures` - Updates all test fixtures (can take 10-15 minutes, runs full test suite twice) +- `UPDATE_FIXTURES=1 ./vendor/bin/phpunit` - Updates installer test fixtures +- `UPDATE_FIXTURES=1 composer test` - Updates any test fixtures +- Any command with `UPDATE_FIXTURES=1` environment variable + +**Why**: These commands: + +- Modify many files across the codebase +- Take significant time to complete (10-15 minutes) +- Run full test suites multiple times +- Should only be run when user explicitly requests fixture updates + +**When user needs fixture updates**: + +- Explain what the command does and how long it will take +- Ask for explicit permission before running +- Let the user run it themselves if they prefer + ### System-Specific Restrictions **Documentation System** (`.vortex/docs/`): diff --git a/.vortex/docs/content/getting-started/features.mdx b/.vortex/docs/content/getting-started/features.mdx index 81db2fb9f..0a1cec411 100644 --- a/.vortex/docs/content/getting-started/features.mdx +++ b/.vortex/docs/content/getting-started/features.mdx @@ -132,7 +132,7 @@ Select a feature from the tab list to view details in the content panel. - [Docker Compose](https://docs.docker.com/compose/) for service orchestration - [Ahoy](https://github.com/ahoy-cli/ahoy) for simplified command management and custom command support - - Pre-configured services stack: Nginx, PHP, MariaDB, Redis, Solr, ClamAV, Chrome + - Pre-configured services stack: Nginx, PHP, MariaDB, Redis, Solr 9, ClamAV, Chrome - Xdebug support for debugging PHP applications - PCOV support for code coverage analysis diff --git a/.vortex/docs/content/tools/docker.mdx b/.vortex/docs/content/tools/docker.mdx index 97000f972..b09fe901f 100644 --- a/.vortex/docs/content/tools/docker.mdx +++ b/.vortex/docs/content/tools/docker.mdx @@ -213,10 +213,16 @@ Vortex: assigned port - run `docker compose port database 3306` to get the port number. - `redis` - an optional container that runs a Redis server. This container is used to store the application cache. -- `solr` - an optional container that runs a Solr server. This container is used - to store the application search index. It can be accessed from the host via a - randomly assigned port - run `docker compose port solr 8983` to get the port - number. +- `solr` - an optional container that runs Apache Solr 9 search server. This container + is used to store the application search index and provide full-text search + capabilities. It uses the `uselagoon/solr-drupal-9` image which includes + pre-configured modules (`extraction`, `langid`, `ltr`, `analysis-extras`) and is + optimized for Drupal workloads with the Search API Solr module. Configuration + files are maintained locally in `.docker/config/solr/config-set/` allowing site + owners to customize and version control their Solr schema. The container can be + accessed from the host via a randomly assigned port - run `docker compose port solr 8983` + to get the port number. The Solr admin interface is available at + `http://localhost:/solr/`. - `clamav` - an optional container that runs a ClamAV antivirus server. This container is used to scan uploaded files for viruses. - `chrome` - container that runs a Chrome browser. This container is diff --git a/.vortex/docs/content/workflows/notifications.mdx b/.vortex/docs/content/workflows/notifications.mdx index 9a57b253b..df3ac6f23 100644 --- a/.vortex/docs/content/workflows/notifications.mdx +++ b/.vortex/docs/content/workflows/notifications.mdx @@ -196,7 +196,6 @@ The notification system automatically extracts the JIRA issue key from the deplo - Label: `feature/proj-123-add-feature` → Issue key: `proj-123` - Label: `feature/PRJ-456-fix-auth` → Issue key: `PRJ-456` - **Comment posted to JIRA issue:** ```text diff --git a/.vortex/docs/cspell.json b/.vortex/docs/cspell.json index 560aed2e3..821346d17 100644 --- a/.vortex/docs/cspell.json +++ b/.vortex/docs/cspell.json @@ -37,6 +37,7 @@ "initialise", "lagooncli", "lando", + "langid", "langlet", "licence", "localdev", @@ -55,13 +56,14 @@ "phpspec", "phpstorm", "pyrech", + "redis", "renovatebot", "ruleset", "shellvar", "standardise", "updatedb", + "uselagoon", "utilising", - "redis", "vincentlanglet", "vlucas", "vortextemplate", diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/accents_et.txt b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/accents_et.txt new file mode 100644 index 000000000..f6fee1d6c --- /dev/null +++ b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/accents_et.txt @@ -0,0 +1 @@ +content_ignored \ No newline at end of file diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/nouns_et.txt b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/nouns_et.txt new file mode 100644 index 000000000..f6fee1d6c --- /dev/null +++ b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/nouns_et.txt @@ -0,0 +1 @@ +content_ignored \ No newline at end of file diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/protwords_et.txt b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/protwords_et.txt new file mode 100644 index 000000000..f6fee1d6c --- /dev/null +++ b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/protwords_et.txt @@ -0,0 +1 @@ +content_ignored \ No newline at end of file diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/stopwords_et.txt b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/stopwords_et.txt new file mode 100644 index 000000000..f6fee1d6c --- /dev/null +++ b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/stopwords_et.txt @@ -0,0 +1 @@ +content_ignored \ No newline at end of file diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/synonyms_et.txt b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/synonyms_et.txt new file mode 100644 index 000000000..f6fee1d6c --- /dev/null +++ b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/config/solr/config-set/synonyms_et.txt @@ -0,0 +1 @@ +content_ignored \ No newline at end of file diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.docker/solr.dockerfile b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/solr.dockerfile index 33bda444c..ab0ec61f9 100644 --- a/.vortex/installer/tests/Fixtures/install/_baseline/.docker/solr.dockerfile +++ b/.vortex/installer/tests/Fixtures/install/_baseline/.docker/solr.dockerfile @@ -2,10 +2,10 @@ # # hadolint global ignore=DL3018 # -# @see https://hub.docker.com/r/uselagoon/solr-8/tags -# @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr/8.Dockerfile +# @see https://hub.docker.com/r/uselagoon/solr-9-drupal/tags +# @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/9.Dockerfile -FROM uselagoon/solr-8:__VERSION__ +FROM uselagoon/solr-9-drupal:__VERSION__ # Solr jump-start config needs to be manually copied from the search_api_solr # Drupal module to .docker/config/solr/config-set. @@ -13,6 +13,7 @@ COPY .docker/config/solr/config-set /solr-conf/conf/ USER root +# Apply custom modifications for Lagoon environment compatibility. RUN sed -i -e "s#\${solr.data.dir:}#/var/solr/\${solr.core.name}#g" /solr-conf/conf/solrconfig.xml && \ sed -i -e "s#solr.lock.type:native#solr.lock.type:none#g" /solr-conf/conf/solrconfig.xml && \ sed -i -e "s#solr.autoSoftCommit.MaxTime=5000#solr.autoSoftCommit.MaxTime=-1#g" /solr-conf/conf/solrcore.properties diff --git a/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-accents_et.txt b/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-accents_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-nouns_et.txt b/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-nouns_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-protwords_et.txt b/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-protwords_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-stopwords_et.txt b/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-stopwords_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-synonyms_et.txt b/.vortex/installer/tests/Fixtures/install/services_no_solr/.docker/config/solr/config-set/-synonyms_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-accents_et.txt b/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-accents_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-nouns_et.txt b/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-nouns_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-protwords_et.txt b/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-protwords_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-stopwords_et.txt b/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-stopwords_et.txt new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-synonyms_et.txt b/.vortex/installer/tests/Fixtures/install/services_none/.docker/config/solr/config-set/-synonyms_et.txt new file mode 100644 index 000000000..e69de29bb