From 4a5302fd6ec6d101958b52e94226c9dadc9d8ae9 Mon Sep 17 00:00:00 2001
From: Rolando Scott <rolando@reas.cr>
Date: Tue, 2 Sep 2025 14:10:11 -0600
Subject: [PATCH 1/2] Additional docker-compose file just for Lando to fix the
 additional_contexts issue

---
 .lando.yml               |  4 ++--
 docker-compose.lando.yml | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.lando.yml

diff --git a/.lando.yml b/.lando.yml
index 89bd256..3e0ff58 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -2,5 +2,5 @@ name: drupalnext-base
 recipe: lagoon
 config:
   flavor: drupal
-  build:
-    - composer install
+  compose:
+    - docker-compose.lando.yml
diff --git a/docker-compose.lando.yml b/docker-compose.lando.yml
new file mode 100644
index 0000000..62c9d57
--- /dev/null
+++ b/docker-compose.lando.yml
@@ -0,0 +1,15 @@
+services:
+  nginx:
+    build:
+      context: .
+      dockerfile: lagoon/nginx.dockerfile
+      args:
+        CLI_IMAGE: ${COMPOSE_PROJECT_NAME:-drupalnext-base}-cli
+
+  php:
+    build:
+      context: .
+      dockerfile: lagoon/php.dockerfile
+      args:
+        CLI_IMAGE: ${COMPOSE_PROJECT_NAME:-drupalnext-base}-cli
+

From 86cd6b4f0b1492d3abcc38cd19aa78263f92a2a4 Mon Sep 17 00:00:00 2001
From: Rolando Scott <rolando@reas.cr>
Date: Tue, 2 Sep 2025 18:39:32 -0600
Subject: [PATCH 2/2] Additional modifications to nullify the
 additional_contexts when merging with the lando only file

---
 .lando.yml               | 14 ++++++++++++++
 docker-compose.lando.yml |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.lando.yml b/.lando.yml
index 3e0ff58..756c0ab 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -2,5 +2,19 @@ name: drupalnext-base
 recipe: lagoon
 config:
   flavor: drupal
+  webroot: web
   compose:
     - docker-compose.lando.yml
+
+events:
+  post-start:
+    - |
+      if [ ! -d vendor ]; then
+        echo "Running composer install..."
+        composer install
+      else
+        echo "Vendor folder exists; skipping composer install."
+      fi
+
+
+
diff --git a/docker-compose.lando.yml b/docker-compose.lando.yml
index 62c9d57..33e130b 100644
--- a/docker-compose.lando.yml
+++ b/docker-compose.lando.yml
@@ -5,6 +5,7 @@ services:
       dockerfile: lagoon/nginx.dockerfile
       args:
         CLI_IMAGE: ${COMPOSE_PROJECT_NAME:-drupalnext-base}-cli
+    additional_contexts: null
 
   php:
     build:
@@ -12,4 +13,4 @@ services:
       dockerfile: lagoon/php.dockerfile
       args:
         CLI_IMAGE: ${COMPOSE_PROJECT_NAME:-drupalnext-base}-cli
-
+    additional_contexts: null