Merge pull request #64 from tulibraries/update-to-solr-9.6.1

Updates to use solrcloud 9.6.1
tulibraries · Jul 12, 2024 · d9f6d6c · d9f6d6c
2 parents 045df26 + 6c328eb
commit d9f6d6c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 45 deletions.
diff --git a/.circleci/build.sh b/.circleci/build.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 set -e
 cd ~/project
-zip -r ~/solrconfig.zip . -x .git
+zip -r ~/solrconfig.zip . -x ".git*" \
+  Gemfile Gemfile.lock "spec/*" "vendor/*" \
+  Makefile ".circle*" "bin/*" LICENSE "README*" \
+  docker-compose.yml
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -54,7 +54,7 @@ jobs:
           command: make test
   run_deploy:
     docker:
-      - image: cimg/python:3.10.13
+      - image: cimg/python:3.12.3
         environment:
           PIPENV_VENV_IN_PROJECT: true
     steps:

diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh
@@ -20,26 +20,26 @@ validate_create() {
 }
 echo
 echo "***"
-echo "* Sending funcake-oai-$CIRCLE_TAG configs to SolrCloud."
+echo "* Sending funcake-oai-$CIRCLE_TAG configs to solrcloud-rocky8."
 echo "***"
-RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X POST --header "Content-Type:application/octet-stream" --data-binary @/home/circleci/solrconfig.zip "https://solrcloud.tul-infra.page/solr/admin/configs?action=UPLOAD&name=funcake-oai-$CIRCLE_TAG")
+RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X POST --header "Content-Type:application/octet-stream" --data-binary @/home/circleci/solrconfig.zip "https://solrcloud-rocky8.tul-infra.page/solr/admin/configs?action=UPLOAD&name=funcake-oai-$CIRCLE_TAG")
 validate_status
 echo
 echo "***"
 echo "* Creating new funcake-oai-$CIRCLE_TAG collection"
 echo "***"
-RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X GET --header 'Accept: application/json' "https://solrcloud.tul-infra.page/solr/admin/collections?action=CREATE&name=funcake-oai-$CIRCLE_TAG-init&numShards=1&replicationFactor=2&maxShardsPerNode=1&collection.configName=funcake-oai-$CIRCLE_TAG")
+RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X GET --header 'Accept: application/json' "https://solrcloud-rocky8.tul-infra.page/solr/admin/collections?action=CREATE&name=funcake-oai-$CIRCLE_TAG-init&numShards=1&replicationFactor=2&maxShardsPerNode=1&collection.configName=funcake-oai-$CIRCLE_TAG")
 validate_status
 echo
 echo "***"
 echo "* Creating dev alias based on configset name."
 echo "***"
-RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X POST --header "Content-Type:application/octet-stream" "https://solrcloud.tul-infra.page/solr/admin/collections?action=CREATEALIAS&name=funcake-oai-$CIRCLE_TAG-dev&collections=funcake-oai-$CIRCLE_TAG-init")
+RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X POST --header "Content-Type:application/octet-stream" "https://solrcloud-rocky8.tul-infra.page/solr/admin/collections?action=CREATEALIAS&name=funcake-oai-$CIRCLE_TAG-dev&collections=funcake-oai-$CIRCLE_TAG-init")
 validate_status
 echo "***"
 echo "* Creating prod alias based on configset name."
 echo "***"
-RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X POST --header "Content-Type:application/octet-stream" "https://solrcloud.tul-infra.page/solr/admin/collections?action=CREATEALIAS&name=funcake-oai-$CIRCLE_TAG-prod&collections=funcake-oai-$CIRCLE_TAG-init")
+RESP=$(curl -u $SOLR_USER:$SOLR_PASSWORD -i -o - --silent -X POST --header "Content-Type:application/octet-stream" "https://solrcloud-rocky8.tul-infra.page/solr/admin/collections?action=CREATEALIAS&name=funcake-oai-$CIRCLE_TAG-prod&collections=funcake-oai-$CIRCLE_TAG-init")
 validate_status
 echo "***"
 echo "* Pushing zip file asset to GitHub release."

diff --git a/.circleci/setup_solr.sh b/.circleci/setup_solr.sh
diff --git a/.circleci/test.sh b/.circleci/test.sh
diff --git a/bin/solr-configs-reset b/bin/solr-configs-reset
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-cp /opt/solr/configs/oai/solrconfig.xml /var/solr/data/oai/
-cp /opt/solr/configs/oai/schema.xml /var/solr/data/oai/
+cp /opt/solr/conf/oai/solrconfig.xml /var/solr/data/oai/
+cp /opt/solr/conf/oai/schema.xml /var/solr/data/oai/
 curl 'http://localhost:8983/solr/admin/cores?action=RELOAD&core=oai'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.3"
 
 services:
   app:
-    image: ruby:3.1.3
+    image: cimg/ruby:3.3.0
     working_dir: /app
     depends_on:
       - solr
@@ -11,22 +11,24 @@ services:
       - .:/app
       - $PWD/bin/load-data:/bin/load-data
     environment:
-      FUNCAKE_OAI_SOLR_URL: "http://solr:8983/solr/oai"
-      SOLR_URL: "http://solr:8983/solr/oai"
+      FUNCAKE_OAI_SOLR_URL: "http://solr:8983/solr/blacklight"
+      SOLR_URL: "http://solr:8983/solr/blacklight"
       SOLR_DISABLE_UPDATE_DATE_CHECK: "true"
       DO_INGEST: "${DO_INGEST}"
       LC_ALL: "C.UTF-8"
       BUNDLE_PATH: /app/vendor/bundle
 
   solr:
-    image: solr:8.3.0
+    image: solr:9.6.1
     volumes:
-      - $PWD/bin/solr-configs-reset:/opt/docker-solr/scripts/solr-configs-reset
-      - .:/opt/solr/configs/oai
+      - $PWD/bin/solr-configs-reset:/opt/docker/scripts/solr-configs-reset
+      - .:/opt/solr/conf/oai
     ports:
       - 8983:8983
     entrypoint:
-      - bash
-      - "-c"
-      - "precreate-core oai /opt/solr/configs/oai; \
-  exec solr -f -a '-Xms256m -Xmx512m'"
+      - docker-entrypoint.sh
+      - solr-precreate
+      - blacklight
+      - /opt/solr/conf/oai
+      - "-Xms256m"
+      - "-Xmx512m"
diff --git a/solrconfig.xml b/solrconfig.xml
@@ -6,13 +6,12 @@
 
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <luceneMatchVersion>7.0.1</luceneMatchVersion>
+  <luceneMatchVersion>8.11</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
   <!-- solr lib dirs -->
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
   <dataDir>${solr.data.dir:}</dataDir>