update prod.yml, SOLR, Postgres

Author: yagee-de

docker-compose.prod.yml

@@ -3,7 +3,7 @@ version: '3.1'
 services:
   db:
     container_name: ${NAME}-db
-    image: postgres:12
+    image: postgres:16
     restart: unless-stopped
     environment:
       - POSTGRES_USER=${DB_USER}
@@ -15,15 +15,15 @@ services:
       - ${DB_PORT}:5432
   solr:
     container_name: ${NAME}-solr
-    image: mycoreorg/mir-solr:2022.06.x
+    image: mycoreorg/mir-solr:2023.06.x
     restart: unless-stopped
     volumes:
       - ${SOLR_DATA}:/var/solr/data
     ports:
       - ${SOLR_HTTP}:8983
   mir:
     container_name: ${NAME}-mir
-    image: mycoreorg/mir:2022.06.x
+    image: mycoreorg/mir:2023.06.x
     restart: unless-stopped
     environment:
       - APP_CONTEXT=${APP_CONTEXT}

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.1'
 services:
   db:
     container_name: ${NAME}-db
-    image: postgres:12
+    image: postgres:16
     restart: unless-stopped
     environment:
       - POSTGRES_USER=${DB_USER}

mir-webapp/src/main/solr/Dockerfile

@@ -1,4 +1,4 @@
-FROM solr:8.11
+FROM solr:9.6
 USER root
 RUN apt-get update && \
     apt-get -y install sudo

mir-webapp/src/main/solr/docker-entrypoint.sh

@@ -104,5 +104,5 @@ echo "    }" >> $secruity_json
 echo "  }" >> $secruity_json
 echo "}" >> $secruity_json
 
-(/opt/docker-solr/scripts/wait-for-solr.sh;/opt/solr/bin/solr zk cp $secruity_json zk:security.json -z localhost:9983)&
-/opt/docker-solr/scripts/solr-foreground -c;
+(/opt/solr/docker/scripts/wait-for-solr.sh;/opt/solr/bin/solr zk cp $secruity_json zk:security.json -z localhost:9983)&
+/opt/solr/docker/scripts/solr-foreground -c;

mir-webapp/src/main/solr/solr.xml

@@ -23,20 +23,22 @@
 
    More information about options available in this configuration file,
    and Solr Core administration can be found online:
-   https://lucene.apache.org/solr/guide/format-of-solr-xml.html
+   https://solr.apache.org/guide/solr/latest/configuration-guide/configuring-solr-xml.html
 -->
 
 <solr>
 
     <int name="maxBooleanClauses">${solr.max.booleanClauses:1024}</int>
     <str name="sharedLib">${solr.sharedLib:}</str>
+    <str name="modules">${solr.modules:}</str>
     <str name="allowPaths">${solr.allowPaths:}</str>
+    <str name="allowUrls">${solr.allowUrls:}</str>
+    <str name="hideStackTrace">${solr.hideStackTrace:false}</str>
 
     <solrcloud>
 
         <str name="host">${host:}</str>
         <int name="hostPort">${solr.port.advertise:0}</int>
-        <str name="hostContext">${hostContext:solr}</str>
 
         <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
 
@@ -45,16 +47,30 @@
         <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
         <str name="zkCredentialsProvider">${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</str>
         <str name="zkACLProvider">${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</str>
+        <str name="zkCredentialsInjector">${zkCredentialsInjector:org.apache.solr.common.cloud.DefaultZkCredentialsInjector}</str>
+        <bool name="distributedClusterStateUpdates">${distributedClusterStateUpdates:false}</bool>
+        <bool name="distributedCollectionConfigSetExecution">${distributedCollectionConfigSetExecution:false}</bool>
+        <int name="minStateByteLenForCompression">${minStateByteLenForCompression:-1}</int>
+        <str name="stateCompressor">${stateCompressor:org.apache.solr.common.util.ZLibCompressor}</str>
 
     </solrcloud>
 
     <shardHandlerFactory name="shardHandlerFactory"
                          class="HttpShardHandlerFactory">
         <int name="socketTimeout">${socketTimeout:600000}</int>
         <int name="connTimeout">${connTimeout:60000}</int>
-        <str name="shardsWhitelist">${solr.shardsWhitelist:}</str>
     </shardHandlerFactory>
 
-    <metrics enabled="${metricsEnabled:true}"/>
+    <metrics enabled="${metricsEnabled:true}">
+        <!--    Solr computes JVM metrics for threads. Computing these metrics, esp. computing deadlocks etc.,
+         requires potentially expensive computations, and can be avoided for every metrics call by
+         setting a high caching expiration interval (in seconds).
+          <caching>
+            <int name="threadsIntervalSeconds">5</int>
+          </caching>
+        -->
+        <!--reporter name="jmx_metrics" group="core" class="org.apache.solr.metrics.reporters.SolrJmxReporter"/-->
+    </metrics>
+
 
 </solr>

mir-webapp/src/main/solr/zoo.cfg

@@ -31,3 +31,4 @@ syncLimit=5
 #autopurge.purgeInterval=1
 
 # Disable ZK AdminServer since we do not use it
+admin.enableServer=false