Merge pull request #1033 from amjad1233/issue-1032-update-solr-drupal…

…-config Add jump_start config to Solr 8 image
uselagoon · Jul 7, 2024 · ceaf011 · ceaf011
2 parents b72b767 + 884adc5
commit ceaf011
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 2,239 deletions.
diff --git a/images/solr-drupal/8.Dockerfile b/images/solr-drupal/8.Dockerfile
@@ -1,9 +1,15 @@
+ARG IMAGE_REPO
+FROM ${IMAGE_REPO:-lagoon}/commons as jumpstart
+
+ADD https://git.drupalcode.org/project/search_api_solr.git#4.3.3 /search_api_solr
+
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/solr-8
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
 
-COPY drupal-4.1.1-solr-8.x-0 /solr-conf
+COPY --from=jumpstart /search_api_solr/jump-start/solr8/config-set /solr-conf/conf
+ENV SOLR_INSTALL_DIR=/opt/solr
 
-CMD ["solr-precreate", "drupal", "/solr-conf"]
+CMD ["solr-precreate", "drupal", "/solr-conf"]
diff --git a/images/solr-drupal/9.Dockerfile b/images/solr-drupal/9.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as jumpstart
 
-ADD https://git.drupalcode.org/project/search_api_solr.git#4.3.2 /search_api_solr
+ADD https://git.drupalcode.org/project/search_api_solr.git#4.3.3 /search_api_solr
 
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/solr-9

diff --git a/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/accents_en.txt b/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/accents_en.txt
diff --git a/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/accents_und.txt b/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/accents_und.txt
diff --git a/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/elevate.xml b/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/elevate.xml
diff --git a/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/protwords_en.txt b/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/protwords_en.txt
diff --git a/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/protwords_und.txt b/images/solr-drupal/drupal-4.1.1-solr-8.x-0/conf/protwords_und.txt