Revert "#15: Install Drupal configset for Solr8 via custom Solr8 imag…

…e. (#163)" This reverts commit 1cff739.
lando · Mar 16, 2023 · 09e53d9 · 09e53d9
1 parent 1cff739
commit 09e53d9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/.github/workflows/build-pantheon-images.yml b/.github/workflows/build-pantheon-images.yml
@@ -18,9 +18,6 @@ jobs:
           - image: pantheon-index
             tag: 3.6-3
             context: recipes/pantheon/3.6-solr
-          - image: pantheon-index
-            tag: 8.8-4
-            context: recipes/pantheon/8.8-solr
           - image: pantheon-appserver
             tag: 8.1-4
             context: recipes/pantheon/8.1-fpm

diff --git a/lib/utils.js b/lib/utils.js
@@ -252,16 +252,15 @@ exports.getPantheonEnvironment = options => ({
  * Helper to build index service
  */
 exports.getPantheonIndex = options => {
-  if (options.solrTag === '8.8') {
+  if (options.solrTag === '8') {
     return {
       services: {
         index: {
-          type: 'solr:8.8.2',
+          type: 'solr:8.11.2',
           portforward: true,
           overrides: {
-            image: `devwithlando/pantheon-index:${options.solrTag}`,
             volumes: [
-              `${options.confDest}/jetty.xml:/opt/solr-8.8.2/server/etc/jetty.xml`,
+              `${options.confDest}/jetty.xml:/opt/solr-8.11.2/server/etc/jetty.xml`,
             ],
           },
         },

diff --git a/recipes/pantheon/8.8-solr/Dockerfile b/recipes/pantheon/8.8-solr/Dockerfile
diff --git a/recipes/pantheon/builder.js b/recipes/pantheon/builder.js
@@ -130,7 +130,7 @@ module.exports = {
       // Set the search version
       const searchVersion = _.toString(_.get(options, 'search.version', '3'));
       // Set solrtag if search is set to solr8.
-      if (searchVersion === '8') options.solrTag = '8.8';
+      if (searchVersion === '8') options.solrTag = searchVersion;
       options.database = `${dbService}:${dbVersion}`;
       // Set correct things based on framework
       options.defaultFiles.vhosts = `${options.framework}.conf.tpl`;