Merge remote-tracking branch 'origin/master' into nightly
This commit is contained in:
commit
f81740fa40
1
changelog.d/20231113_135404_r.khetani.md
Normal file
1
changelog.d/20231113_135404_r.khetani.md
Normal file
@ -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)
|
||||||
@ -1,4 +1,4 @@
|
|||||||
__version__ = "16.0.1"
|
__version__ = "16.0.2"
|
||||||
__package_version__ = __version__
|
__package_version__ = __version__
|
||||||
|
|
||||||
# Handle version suffix for nightly, just like tutor core.
|
# Handle version suffix for nightly, just like tutor core.
|
||||||
|
|||||||
@ -4,5 +4,4 @@ xqueue-job:
|
|||||||
- ../plugins/xqueue/apps/settings/tutor.py:/openedx/xqueue/xqueue/tutor.py:ro
|
- ../plugins/xqueue/apps/settings/tutor.py:/openedx/xqueue/xqueue/tutor.py:ro
|
||||||
environment:
|
environment:
|
||||||
DJANGO_SETTINGS_MODULE: xqueue.tutor
|
DJANGO_SETTINGS_MODULE: xqueue.tutor
|
||||||
depends_on:
|
depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
|
||||||
- mysql
|
|
||||||
Loading…
x
Reference in New Issue
Block a user