Merge pull request #4 from goalgorilla/feature/solr-9

Add Solr 9 support with new config

.github/workflows/build-solr.yml

@@ -22,10 +22,15 @@ jobs:
 
     strategy:
       matrix:
-        version:
-          - "8.11"
-          - "9"
-          - latest
+        include:
+          - version: 8
+            config_version: 8
+          - version: 8.11
+            config_version: 8
+          - version: 9.2
+            config_version: 9
+          - version: latest
+            config_version: 9
 
     # There should be no need to edit below this line.
     steps:
@@ -46,7 +51,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v4
         with:
-          build-args: VERSION=${{ matrix.version }}
+          build-args: VERSION=${{ matrix.version }} CONFIG_VERSION=${{ matrix.config_version }}
           context: "{{defaultContext}}:${{ env.SUBDIRECTORY }}"
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.version }}

.github/workflows/build-tugboat-solr.yml

@@ -22,10 +22,15 @@ jobs:
 
     strategy:
       matrix:
-        version:
-          - "8.11"
-          - "9"
-          - latest
+        include:
+          - version: 8
+            config_version: 8
+          - version: 8.11
+            config_version: 8
+          - version: 9.2
+            config_version: 9
+          - version: latest
+            config_version: 9
 
     # There should be no need to edit below this line.
     steps:
@@ -46,7 +51,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v4
         with:
-          build-args: VERSION=${{ matrix.version }}
+          build-args: VERSION=${{ matrix.version }} CONFIG_VERSION=${{ matrix.config_version }}
           context: "{{defaultContext}}:${{ env.SUBDIRECTORY }}"
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.version }}

solr/Dockerfile

@@ -1,7 +1,10 @@
 ARG VERSION=latest
+ARG CONFIG_VERSION=9
 
 FROM solr:$VERSION
 
-ADD config /solr-conf/conf
+ARG CONFIG_VERSION
 
-ENTRYPOINT ["solr-precreate", "drupal", "/solr-conf"]
+ADD config-"${CONFIG_VERSION}" /solr-conf/conf
+
+ENTRYPOINT ["solr-precreate", "drupal", "/solr-conf"]

solr/config-9/lang/accents_ca.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"