Feature/solr upgrade

.gitignore

@@ -34,12 +34,14 @@ data/**/*.csv
 data/**/*.csv.bak
 
 # docker
-docker-emlo/solr-data
-docker-emlo/redis
-!docker-emlo/solr-data/.keep
-docker-emlo/csv_import_files
-!docker-emlo/csv_import_files-data/.keep
-docker-emlo/solr-conf/solr/home/**/core.properties
+docker/solr-data
+!docker/solr-data/.keep
+docker/solr9-data
+!docker/solr9-data/.keep
+docker/csv_import_files
+!docker/csv_import_files-data/.keep
+docker/solr/**/core.properties
+docker/solr9/**/core.properties
 
 # ENV folder
 site-front-2

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     restart: always
     build:
       context: .
-      dockerfile: ./docker-emlo/Dockerfile-flask
+      dockerfile: ./docker/Dockerfile-flask
     env_file:
       - .env
     expose:
@@ -16,16 +16,35 @@ services:
     command: bash -c "/bin/docker-entrypoint.sh"
 
   solr:
-    build: ./docker-emlo/solr-conf
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile-solr
     restart: always
     environment:
       SOLR_LOG_LEVEL: INFO
       LD_BIND_NOW: 1
     ports:
       - "8983:8983"
     volumes:
-      - ./docker-emlo/solr-conf/solr/home:/opt/solr/server/solr/home
-      - ./docker-emlo/solr-data:/data-solr
+      - ./docker/solr:/opt/solr/server/solr/home
+      - ./docker/solr-data:/data-solr
+    ulimits:
+      nofile:
+        soft: "65536"
+        hard: "65536"
+
+  solr9:
+    image: solr:9
+    restart: always
+    environment:
+      SOLR_LOG_LEVEL: INFO
+      LD_BIND_NOW: 1
+      SOLR_SECURITY_MANAGER_ENABLED: false
+    ports:
+      - "8984:8983"
+    volumes:
+      - ./docker/solr9:/var/solr/data
+      - ./docker/solr9-data:/data-solr
     ulimits:
       nofile:
         soft: "65536"

docker-emlo/solr-conf/Dockerfile → docker/Dockerfile-solr

@@ -17,7 +17,7 @@ LABEL version="0.4.0"
 RUN sed -i "s/SOLR_HEAP=\".*\"/SOLR_HEAP=\"2048m\"/" /opt/solr/bin/solr.in.sh
 
 # Solr core configuration
-ADD /solr/home /opt/solr/server/solr/home
+ADD docker/solr /opt/solr/server/solr/home
 
 # Allow solr to write to folders
 USER root

docker/solr9/all/conf/lang/contractions_ca.txt

@@ -0,0 +1,8 @@
+# Set of Catalan contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+l
+m
+n
+s
+t

docker/solr9/all/conf/lang/contractions_fr.txt

@@ -0,0 +1,15 @@
+# Set of French contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+l
+m
+t
+qu
+n
+s
+j
+d
+c
+jusqu
+quoiqu
+lorsqu
+puisqu

docker/solr9/all/conf/lang/contractions_ga.txt

@@ -0,0 +1,5 @@
+# Set of Irish contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+m
+b

docker/solr9/all/conf/lang/contractions_it.txt

@@ -0,0 +1,23 @@
+# Set of Italian contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+c
+l 
+all 
+dall 
+dell 
+nell 
+sull 
+coll 
+pell 
+gl 
+agl 
+dagl 
+degl 
+negl 
+sugl 
+un 
+m 
+t 
+s 
+v 
+d

docker/solr9/all/conf/lang/hyphenations_ga.txt

@@ -0,0 +1,5 @@
+# Set of Irish hyphenations for StopFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+h
+n
+t

docker/solr9/all/conf/lang/stemdict_nl.txt

@@ -0,0 +1,6 @@
+# Set of overrides for the dutch stemmer
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+fiets	fiets
+bromfiets	bromfiets
+ei	eier
+kind	kinder