From f7174fbdce66617b1ea4403f65b2844de4f83e01 Mon Sep 17 00:00:00 2001 From: Kshitij Sobti Date: Thu, 25 Jan 2024 14:13:49 +0530 Subject: [PATCH 1/2] fix: Fix tutor when using docker compose versions > 2.24.1 --- tutor/templates/dev/docker-compose.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tutor/templates/dev/docker-compose.yml b/tutor/templates/dev/docker-compose.yml index 90fbe84..e113d1d 100644 --- a/tutor/templates/dev/docker-compose.yml +++ b/tutor/templates/dev/docker-compose.yml @@ -6,10 +6,7 @@ x-openedx-service: stdin_open: true tty: true 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 + # Settings & config volumes are merged in from `local` docker compose config # theme files - ../build/openedx/themes:/openedx/themes From 2924b92ceab8aca550ec5ecae559a367fb1b713a Mon Sep 17 00:00:00 2001 From: Kshitij Sobti Date: Mon, 29 Jan 2024 14:51:34 +0530 Subject: [PATCH 2/2] fixup!: Apply review feedback --- changelog.d/20240129_144929_kshitij_fix_tutor_docker_compose.md | 2 ++ tutor/templates/dev/docker-compose.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/20240129_144929_kshitij_fix_tutor_docker_compose.md diff --git a/changelog.d/20240129_144929_kshitij_fix_tutor_docker_compose.md b/changelog.d/20240129_144929_kshitij_fix_tutor_docker_compose.md new file mode 100644 index 0000000..4a9625c --- /dev/null +++ b/changelog.d/20240129_144929_kshitij_fix_tutor_docker_compose.md @@ -0,0 +1,2 @@ +- [Bugfix] Fixes duplicate volume declarations causing Tutor commands that + invoke Docker to fail. \ No newline at end of file diff --git a/tutor/templates/dev/docker-compose.yml b/tutor/templates/dev/docker-compose.yml index e113d1d..4aa01ee 100644 --- a/tutor/templates/dev/docker-compose.yml +++ b/tutor/templates/dev/docker-compose.yml @@ -6,7 +6,6 @@ x-openedx-service: stdin_open: true tty: true volumes: - # Settings & config volumes are merged in from `local` docker compose config # theme files - ../build/openedx/themes:/openedx/themes