Merge remote-tracking branch 'origin/master' into nightly

overhangio · Jan 30, 2024 · 2d2ae3f · 2d2ae3f
2 parents a21f920 + 2924b92
commit 2d2ae3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/changelog.d/20240129_144929_kshitij_fix_tutor_docker_compose.md 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.
diff --git a/tutor/templates/dev/docker-compose.yml b/tutor/templates/dev/docker-compose.yml
@@ -6,10 +6,6 @@ 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
     # theme files
     - ../build/openedx/themes:/openedx/themes
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- [Bugfix] Fixes duplicate volume declarations causing Tutor commands that
		invoke Docker to fail.