From 225d9372df103ae41edd7e3f2df3503c4ae8aeb9 Mon Sep 17 00:00:00 2001
From: HyphenHook <fghjru1@gmail.com>
Date: Fri, 9 Feb 2024 13:53:46 -0500
Subject: [PATCH 1/2] Fixed code-server not mounting codebase

---
 build/docker-compose/docker-compose.code-server.yml |  8 ++------
 docs/troubleshooting.md                             | 10 ++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build/docker-compose/docker-compose.code-server.yml b/build/docker-compose/docker-compose.code-server.yml
index 28528900c..b9d75cfe5 100644
--- a/build/docker-compose/docker-compose.code-server.yml
+++ b/build/docker-compose/docker-compose.code-server.yml
@@ -44,11 +44,7 @@ services:
       - CODE_SERVER_PASSWORD
     volumes:
       # Mount and serve contents of Drupal site.
-      - type: volume
-        source: drupal-root
-        target: /var/www/drupal
-        volume:
-          nocopy: true
+      - ../../codebase:/var/www/drupal:delegated
       # Mount and serve Drupal files.
       - type: volume
         source: drupal-sites-data
@@ -79,7 +75,7 @@ services:
       - traefik.enable=false
     volumes:
       # Allow code-server to serve Drupal / override it.
-      - drupal-root:/var/www/drupal
+      - ../../codebase:/var/www/drupal:delegated
     deploy:
       resources:
           limits:
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 2cccd7e35..4d3a10050 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -139,3 +139,13 @@ A log of the error is needed for the fix to review. A full description of the is
 To fix this:
 
 * Run `make fix_views`
+
+## For Windows, error when executing make on trying to composer install within drupal container
+**Error:**
+```bash
+docker-compose exec -T drupal with-contenv bash -lc 'composer install'
+s6-envdir: fatal: unable to envdir: No such file or directory
+```
+To fix this:
+ * edit the Makefile and replace the `docker-compose exec -T drupal with-contenv bash -lc 'composer install'` line with `docker-compose exec -T drupal composer install`
+ * rerun make
\ No newline at end of file

From cdfd55fef444a119f36bb01e20d4441794fbbc57 Mon Sep 17 00:00:00 2001
From: HyphenHook <113998959+HyphenHook@users.noreply.github.com>
Date: Mon, 12 Feb 2024 09:36:36 -0500
Subject: [PATCH 2/2] Update docker-compose.code-server.yml

---
 build/docker-compose/docker-compose.code-server.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/docker-compose/docker-compose.code-server.yml b/build/docker-compose/docker-compose.code-server.yml
index b9d75cfe5..8718c5851 100644
--- a/build/docker-compose/docker-compose.code-server.yml
+++ b/build/docker-compose/docker-compose.code-server.yml
@@ -83,6 +83,5 @@ services:
           reservations:
             memory: 2G
 volumes:
-  drupal-root: {}
   drupal-sites-data: {}
   code-server-data: {}