fix: actually mount notes directory

Notes directory could be added via `tutor mounts add ./edx-notes-api`, but it was not actually being mounted.
overhangio · Oct 24, 2024 · 9dd2cf9 · 9dd2cf9
1 parent 33e38b7
commit 9dd2cf9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/changelog.d/20241017_233457_regis_meilisearch.md b/changelog.d/20241017_233457_regis_meilisearch.md
@@ -0,0 +1 @@
+- [Bugfix] Actually mount edx-notes-api repositories from host on `tutor mounts add /path/to/edx-notes-api`. (by @regisb)
diff --git a/tutornotes/patches/local-docker-compose-jobs-services b/tutornotes/patches/local-docker-compose-jobs-services
@@ -4,4 +4,7 @@ notes-job:
     DJANGO_SETTINGS_MODULE: notesserver.settings.tutor
   volumes:
     - ../plugins/notes/apps/settings/tutor.py:/app/edx-notes-api/notesserver/settings/tutor.py:ro
+    {%- for mount in iter_mounts(MOUNTS, "notes") %}
+    - {{ mount }}
+    {%- endfor %}
   depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
diff --git a/tutornotes/patches/local-docker-compose-services b/tutornotes/patches/local-docker-compose-services
@@ -6,5 +6,8 @@ notes:
   volumes:
     - ../plugins/notes/apps/settings/tutor.py:/app/edx-notes-api/notesserver/settings/tutor.py:ro
     - ../../data/notes:/app/data
+    {%- for mount in iter_mounts(MOUNTS, "notes") %}
+    - {{ mount }}
+    {%- endfor %}
   restart: unless-stopped
   depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
diff --git a/tutornotes/templates/notes/apps/settings/tutor.py b/tutornotes/templates/notes/apps/settings/tutor.py
@@ -10,7 +10,7 @@
     "default": {
         "ENGINE": "django.db.backends.mysql",
         "HOST": "{{ MYSQL_HOST }}",
-        "PORT": {{MYSQL_PORT}},
+        "PORT": {{ MYSQL_PORT }},
         "NAME": "{{ NOTES_MYSQL_DATABASE }}",
         "USER": "{{ NOTES_MYSQL_USERNAME }}",
         "PASSWORD": "{{ NOTES_MYSQL_PASSWORD }}",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Bugfix] Actually mount edx-notes-api repositories from host on `tutor mounts add /path/to/edx-notes-api`. (by @regisb)