From fc7a17a4674a7025ec2c02b10937662033cd3bcd Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Wed, 11 Sep 2024 21:04:07 -0400 Subject: [PATCH 1/2] Add Fix for issue related to codeserver: https://github.com/Islandora-Devops/isle-dc/issues/372 --- .../docker-compose/docker-compose.code-server.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build/docker-compose/docker-compose.code-server.yml b/build/docker-compose/docker-compose.code-server.yml index 3ebfb6676..9b0c4ec4c 100644 --- a/build/docker-compose/docker-compose.code-server.yml +++ b/build/docker-compose/docker-compose.code-server.yml @@ -2,9 +2,12 @@ # # References: # - https://www.drupal.org/docs +version: '3.7' networks: default: internal: true + gateway: + external: true secrets: CODE_SERVER_PASSWORD: file: "../../secrets/live/CODE_SERVER_PASSWORD" @@ -41,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 @@ -76,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: @@ -84,6 +83,5 @@ services: reservations: memory: 2G volumes: - drupal-root: {} drupal-sites-data: {} - code-server-data: {} + code-server-data: {} \ No newline at end of file From ba1c4f611d6dfaf86d230806e5ec9f05938c2e2c Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Thu, 3 Oct 2024 09:56:14 -0400 Subject: [PATCH 2/2] Removed the version of code-server --- 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 9b0c4ec4c..f4051d9df 100644 --- a/build/docker-compose/docker-compose.code-server.yml +++ b/build/docker-compose/docker-compose.code-server.yml @@ -2,7 +2,6 @@ # # References: # - https://www.drupal.org/docs -version: '3.7' networks: default: internal: true