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

overhangio · Nov 14, 2023 · f81740f · f81740f
2 parents b25a7e2 + 84ceed2
commit f81740f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/changelog.d/20231113_135404_r.khetani.md 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)
diff --git 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.

diff --git 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
+  depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}