From c93d2a3e35756b195ac08858cf2f2e5d0c8bc074 Mon Sep 17 00:00:00 2001 From: ravikhetani Date: Tue, 14 Nov 2023 23:01:33 +0000 Subject: [PATCH 1/2] fix: service "xqueue-job" depends on undefined service mysql: invalid compose project (#24) * fix: docker compose error, dependency sql missing, when running with RUN_MYSQL=false * fix spelling error --------- Co-authored-by: Ravi Khetani --- changelog.d/20231113_135404_r.khetani.md | 1 + tutorxqueue/patches/local-docker-compose-jobs-services | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 changelog.d/20231113_135404_r.khetani.md diff --git a/changelog.d/20231113_135404_r.khetani.md b/changelog.d/20231113_135404_r.khetani.md new file mode 100644 index 0000000..f66c13e --- /dev/null +++ b/changelog.d/20231113_135404_r.khetani.md @@ -0,0 +1 @@ +- [Bugfix] Fix "Error: service "xqueue-job" depends on undefined service mysql: invalid compose project" - add conditional statement to check whether the mysql service is enabled or if the user is using an external mysql instance. (by @ravikhetani) \ No newline at end of file diff --git a/tutorxqueue/patches/local-docker-compose-jobs-services b/tutorxqueue/patches/local-docker-compose-jobs-services index 7c2c325..77d237d 100644 --- a/tutorxqueue/patches/local-docker-compose-jobs-services +++ b/tutorxqueue/patches/local-docker-compose-jobs-services @@ -4,5 +4,4 @@ xqueue-job: - ../plugins/xqueue/apps/settings/tutor.py:/openedx/xqueue/xqueue/tutor.py:ro environment: DJANGO_SETTINGS_MODULE: xqueue.tutor - depends_on: - - mysql \ No newline at end of file + depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }} \ No newline at end of file From 84ceed2f923a92df494cf5317892d4d7da400bc9 Mon Sep 17 00:00:00 2001 From: jfavellar90 Date: Tue, 14 Nov 2023 18:03:59 -0500 Subject: [PATCH 2/2] v16.0.2 --- tutorxqueue/__about__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py index 856e0a9..5f3e59d 100644 --- a/tutorxqueue/__about__.py +++ b/tutorxqueue/__about__.py @@ -1,4 +1,4 @@ -__version__ = "16.0.1" +__version__ = "16.0.2" __package_version__ = __version__ # Handle version suffix for nightly, just like tutor core.