fix: remove trailing slashes in volume paths for docker-compose v2 co…

…mpatibility

close overhangio#522

CHANGELOG.md

@@ -3,7 +3,7 @@
 Note: Breaking changes between versions are indicated by "💥".
 
 ## Unreleased
-
+- [Bugfix] Remove trailing slashes in docker-compose files for [compatibility with docker-compose v2 in WSL](https://github.com/docker/compose/issues/8558).
 - [Feature] Add [tutor-richie](https://github.com/overhangio/tutor-richie) to the plugins that are bundled with the tutor binary.
 - [Improvement] Make `tutor plugins list` print plugins sorted by name.
 - [Improvement] Ignore Python plugins which cannot be loaded.

tutor/templates/dev/docker-compose.yml

@@ -7,9 +7,9 @@ x-openedx-service:
     SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.development}
   volumes:
     # Settings & config
-    - ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
-    - ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
-    - ../apps/openedx/config/:/openedx/config/:ro
+    - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
+    - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
+    - ../apps/openedx/config:/openedx/config:ro
     # theme files
     - ../build/openedx/themes:/openedx/themes
     # editable requirements

tutor/templates/local/docker-compose.jobs.yml

@@ -11,9 +11,9 @@ services:
         SERVICE_VARIANT: lms
         SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
       volumes:
-        - ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
-        - ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
-        - ../apps/openedx/config/:/openedx/config/:ro
+        - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
+        - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
+        - ../apps/openedx/config:/openedx/config:ro
       depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
 
     cms-job:
@@ -22,9 +22,9 @@ services:
         SERVICE_VARIANT: cms
         SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
       volumes:
-        - ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
-        - ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
-        - ../apps/openedx/config/:/openedx/config/:ro
+        - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
+        - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
+        - ../apps/openedx/config:/openedx/config:ro
       depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
 
     forum-job:

tutor/templates/local/docker-compose.prod.yml

@@ -30,7 +30,7 @@ services:
           {{ patch("local-docker-compose-nginx-aliases")|indent(10) }}
     {% endif %}
     volumes:
-      - ../apps/nginx:/etc/nginx/conf.d/:ro
+      - ../apps/nginx:/etc/nginx/conf.d:ro
     depends_on: {{ [("lms", RUN_LMS), ("cms", RUN_CMS)]|list_if }}
 
   {{ patch("local-docker-compose-prod-services")|indent(2) }}

tutor/templates/local/docker-compose.yml

@@ -85,9 +85,9 @@ services:
       SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
     restart: unless-stopped
     volumes:
-      - ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
-      - ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
-      - ../apps/openedx/config/:/openedx/config/:ro
+      - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
+      - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
+      - ../apps/openedx/config:/openedx/config:ro
       - ../../data/lms:/openedx/data
       - ../../data/openedx-media:/openedx/media
     depends_on:
@@ -109,9 +109,9 @@ services:
       SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
     restart: unless-stopped
     volumes:
-      - ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
-      - ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
-      - ../apps/openedx/config/:/openedx/config/:ro
+      - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
+      - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
+      - ../apps/openedx/config:/openedx/config:ro
       - ../../data/cms:/openedx/data
       - ../../data/openedx-media:/openedx/media
     depends_on:
@@ -136,9 +136,9 @@ services:
     command: celery worker --app=lms.celery --loglevel=info --hostname=edx.lms.core.default.%%h --maxtasksperchild=100 --exclude-queues=edx.cms.core.default
     restart: unless-stopped
     volumes:
-      - ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
-      - ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
-      - ../apps/openedx/config/:/openedx/config/:ro
+      - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
+      - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
+      - ../apps/openedx/config:/openedx/config:ro
       - ../../data/lms:/openedx/data
       - ../../data/openedx-media:/openedx/media
     depends_on:
@@ -155,9 +155,9 @@ services:
     command: celery worker --app=cms.celery --loglevel=info --hostname=edx.cms.core.default.%%h --maxtasksperchild 100 --exclude-queues=edx.lms.core.default
     restart: unless-stopped
     volumes:
-      - ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
-      - ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
-      - ../apps/openedx/config/:/openedx/config/:ro
+      - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
+      - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
+      - ../apps/openedx/config:/openedx/config:ro
       - ../../data/cms:/openedx/data
       - ../../data/openedx-media:/openedx/media
     depends_on: