diff --git a/changelog.d/20241017_233457_regis_meilisearch.md b/changelog.d/20241017_233457_regis_meilisearch.md new file mode 100644 index 0000000..e21cac3 --- /dev/null +++ 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 index 0dc5f79..efbd8db 100644 --- 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 index e55c40e..ec6b37a 100644 --- 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 index 18e0623..35b0b34 100644 --- 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 }}",