build: update to Solr 9 (latest), fixes #69 (#70)

Author: stefan-korn

README.md

@@ -195,11 +195,33 @@ ddev solr version
 
 Make sure to commit the `.ddev/.env.solr` file to version control.
 
+### Add custom Solr libraries via SOLR_MODULES env variable
+
+Since version 9.8 Solr deprecates lib-directives: https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#solr-9-8
+
+To enable custom libraries you can use `SOLR_MODULES` environment variable.
+
+By default it is set to `SOLR_MODULES: "extraction,langid,ltr,analysis-extras"` to work with
+Drupal Search API Solr default (jump start) config.
+
+You can unset by using:
+
+```
+ddev dotenv set .ddev/.env.solr --solr-modules=
+```
+
+or set to custom value:
+
+```
+ddev dotenv set .ddev/.env.solr --solr-modules=extraction,ltr
+```
+
 All customization options (use with caution):
 
-| Variable | Flag | Default |
-| -------- | ---- | ------- |
-| `SOLR_BASE_IMAGE` | `--solr-base-image` | `solr:9.6` |
+| Variable          | Flag                | Default   |
+|-------------------|---------------------|-----------|
+| `SOLR_BASE_IMAGE` | `--solr-base-image` | `solr:9` |
+| `SOLR_MODULES`    | `--solr-modules`    | `extraction,langid,ltr,analysis-extras` |
 
 ### Add third party Solr modules and libraries
 
@@ -210,6 +232,9 @@ collection's `solrconfig.xml`:
 <lib dir="/opt/solr/modules/ddev/lib/" regex=".*\.jar" />
 ```
 
+Attention: This changed since Solr 9.8, read https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#solr-9-8 
+for details.
+
 ## Solarium PHP client
 
 [Solarium](https://github.com/solariumphp/solarium) is the leading Solr

docker-compose.solr.yaml

@@ -1,7 +1,7 @@
 #ddev-generated
 services:
   solr:
-    image: ${SOLR_BASE_IMAGE:-solr:9.6}-${DDEV_SITENAME}-built
+    image: ${SOLR_BASE_IMAGE:-solr:9}-${DDEV_SITENAME}-built
     build:
       dockerfile_inline: |
         ARG SOLR_BASE_IMAGE="scratch"
@@ -15,7 +15,7 @@ services:
         RUN sed -i "/\$$rootScope.exceptions = {};/a \$$scope.username = 'solr'; \$$scope.password = 'SolrRocks';" /opt/solr/server/solr-webapp/webapp/js/angular/controllers/login.js
         USER solr
       args:
-        SOLR_BASE_IMAGE: ${SOLR_BASE_IMAGE:-solr:9.6}
+        SOLR_BASE_IMAGE: ${SOLR_BASE_IMAGE:-solr:9}
     container_name: ddev-${DDEV_SITENAME}-solr
     expose:
       - 8983
@@ -30,6 +30,8 @@ services:
       #SOLR_HEAP: 1g
       SOLR_AUTH_TYPE: basic
       SOLR_AUTHENTICATION_OPTS: -Dbasicauth=solr:SolrRocks
+      # needed for Drupal Search API Solr
+      SOLR_MODULES: ${SOLR_MODULES-extraction,langid,ltr,analysis-extras}
       VIRTUAL_HOST: ${DDEV_HOSTNAME}
       HTTP_EXPOSE: 8983:8983
       HTTPS_EXPOSE: 8943:8983