From 064470331ff1fba121b61148eb7e44316b0ba6ee Mon Sep 17 00:00:00 2001
From: Alec Reynolds <alec+git@lando.dev>
Date: Wed, 7 Dec 2022 10:38:21 -0800
Subject: [PATCH] #15: Address PR comments to update docs and make sure Solr8
 config doesn't bleed in to Solr3.

---
 docs/config.md              | 4 ++--
 recipes/pantheon/builder.js | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index e5f3db4..62f76bf 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -26,11 +26,11 @@ If you do not already have a [Landofile](https://docs.lando.dev/config/lando.htm
 
 Note that if the above config options are not enough, all Lando recipes can be further [extended and overriden](https://docs.lando.dev/config/recipes.html#extending-and-overriding-recipes).
 
-## Choosing PHP/database/Solr versions
+## Choosing service versions
 
 Lando will look for a [`pantheon.yml`](https://pantheon.io/docs/pantheon-yml/) (and/or `pantheon.upstream.yml`) in your app's root directory and use the values you've set for `php_version`, `database`, and `search` you've specified there.
 
-This means that **you can not configure the php version directly in your Landofile for this recipe.**
+This means that **you can not configure php, mysql, or solr versions directly in your Landofile for this recipe.**
 
 If you change this version, make sure you [`lando rebuild`](https://docs.lando.dev/cli/rebuild.html) for the changes to apply.
 
diff --git a/recipes/pantheon/builder.js b/recipes/pantheon/builder.js
index b519e4d..7c5756d 100644
--- a/recipes/pantheon/builder.js
+++ b/recipes/pantheon/builder.js
@@ -21,7 +21,10 @@ const overrideAppserver = options => {
   options.services.appserver.overrides.environment = utils.getPantheonEnvironment(options);
 
   // Override the Solr8 service.
-  options.services.index.overrides.volumes.push(`${options.confDest}/jetty.xml:/opt/solr-8.11.2/server/etc/jetty.xml`);
+  if (options.solrTag === '8') {
+    options.services.index.overrides.volumes.push(`${options.confDest}/jetty.xml:/opt/solr-8.11.2/server/etc/jetty.xml`);
+  }
+
   return options;
 };