mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-09-27 19:59:02 +00:00
Merge branch 'master' into nightly
This commit is contained in:
commit
9a695da768
@ -3,6 +3,7 @@
|
|||||||
Note: Breaking changes between versions are indicated by "💥".
|
Note: Breaking changes between versions are indicated by "💥".
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
- [Bugfix] Remove trailing slashes in docker-compose files for [compatibility with docker-compose v2 in WSL](https://github.com/docker/compose/issues/8558).
|
||||||
|
|
||||||
## v12.1.7 (2021-11-18)
|
## v12.1.7 (2021-11-18)
|
||||||
|
|
||||||
|
@ -101,16 +101,16 @@ You are then free to bind-mount any directory to any container. For instance, to
|
|||||||
services:
|
services:
|
||||||
lms:
|
lms:
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/edx-platform/:/openedx/edx-platform
|
- /path/to/edx-platform:/openedx/edx-platform
|
||||||
cms:
|
cms:
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/edx-platform/:/openedx/edx-platform
|
- /path/to/edx-platform:/openedx/edx-platform
|
||||||
lms-worker:
|
lms-worker:
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/edx-platform/:/openedx/edx-platform
|
- /path/to/edx-platform:/openedx/edx-platform
|
||||||
cms-worker:
|
cms-worker:
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/edx-platform/:/openedx/edx-platform
|
- /path/to/edx-platform:/openedx/edx-platform
|
||||||
|
|
||||||
This override file will be loaded when running any ``tutor dev ..`` command. The edx-platform repo mounted at the specified path will be automatically mounted inside all LMS and CMS containers. With this file, you should no longer specify the ``-v/--volume`` option from the command line with the ``run`` or ``runserver`` commands.
|
This override file will be loaded when running any ``tutor dev ..`` command. The edx-platform repo mounted at the specified path will be automatically mounted inside all LMS and CMS containers. With this file, you should no longer specify the ``-v/--volume`` option from the command line with the ``run`` or ``runserver`` commands.
|
||||||
|
|
||||||
|
@ -12,9 +12,9 @@ x-openedx-service:
|
|||||||
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.development}
|
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.development}
|
||||||
volumes:
|
volumes:
|
||||||
# Settings & config
|
# Settings & config
|
||||||
- ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
|
- ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
|
||||||
- ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
|
- ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
|
||||||
- ../apps/openedx/config/:/openedx/config/:ro
|
- ../apps/openedx/config:/openedx/config:ro
|
||||||
# theme files
|
# theme files
|
||||||
- ../build/openedx/themes:/openedx/themes
|
- ../build/openedx/themes:/openedx/themes
|
||||||
# editable requirements
|
# editable requirements
|
||||||
|
@ -11,9 +11,9 @@ services:
|
|||||||
SERVICE_VARIANT: lms
|
SERVICE_VARIANT: lms
|
||||||
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
||||||
volumes:
|
volumes:
|
||||||
- ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
|
- ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
|
||||||
- ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
|
- ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
|
||||||
- ../apps/openedx/config/:/openedx/config/:ro
|
- ../apps/openedx/config:/openedx/config:ro
|
||||||
depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
|
depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
|
||||||
|
|
||||||
cms-job:
|
cms-job:
|
||||||
@ -22,9 +22,9 @@ services:
|
|||||||
SERVICE_VARIANT: cms
|
SERVICE_VARIANT: cms
|
||||||
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
||||||
volumes:
|
volumes:
|
||||||
- ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
|
- ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
|
||||||
- ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
|
- ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
|
||||||
- ../apps/openedx/config/:/openedx/config/:ro
|
- ../apps/openedx/config:/openedx/config:ro
|
||||||
depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
|
depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
|
||||||
|
|
||||||
{{ patch("local-docker-compose-jobs-services")|indent(4) }}
|
{{ patch("local-docker-compose-jobs-services")|indent(4) }}
|
||||||
|
@ -108,9 +108,9 @@ services:
|
|||||||
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
|
- ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
|
||||||
- ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
|
- ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
|
||||||
- ../apps/openedx/config/:/openedx/config/:ro
|
- ../apps/openedx/config:/openedx/config:ro
|
||||||
- ../../data/lms:/openedx/data
|
- ../../data/lms:/openedx/data
|
||||||
- ../../data/openedx-media:/openedx/media
|
- ../../data/openedx-media:/openedx/media
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -139,9 +139,9 @@ services:
|
|||||||
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
SETTINGS: ${TUTOR_EDX_PLATFORM_SETTINGS:-tutor.production}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
|
- ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
|
||||||
- ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
|
- ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
|
||||||
- ../apps/openedx/config/:/openedx/config/:ro
|
- ../apps/openedx/config:/openedx/config:ro
|
||||||
- ../../data/cms:/openedx/data
|
- ../../data/cms:/openedx/data
|
||||||
- ../../data/openedx-media:/openedx/media
|
- ../../data/openedx-media:/openedx/media
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -173,9 +173,9 @@ services:
|
|||||||
command: celery worker --app=lms.celery --loglevel=info --hostname=edx.lms.core.default.%%h --maxtasksperchild=100 --exclude-queues=edx.cms.core.default
|
command: celery worker --app=lms.celery --loglevel=info --hostname=edx.lms.core.default.%%h --maxtasksperchild=100 --exclude-queues=edx.cms.core.default
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
|
- ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
|
||||||
- ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
|
- ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
|
||||||
- ../apps/openedx/config/:/openedx/config/:ro
|
- ../apps/openedx/config:/openedx/config:ro
|
||||||
- ../../data/lms:/openedx/data
|
- ../../data/lms:/openedx/data
|
||||||
- ../../data/openedx-media:/openedx/media
|
- ../../data/openedx-media:/openedx/media
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -191,9 +191,9 @@ services:
|
|||||||
command: celery worker --app=cms.celery --loglevel=info --hostname=edx.cms.core.default.%%h --maxtasksperchild 100 --exclude-queues=edx.lms.core.default
|
command: celery worker --app=cms.celery --loglevel=info --hostname=edx.cms.core.default.%%h --maxtasksperchild 100 --exclude-queues=edx.lms.core.default
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ../apps/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/:ro
|
- ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro
|
||||||
- ../apps/openedx/settings/cms/:/openedx/edx-platform/cms/envs/tutor/:ro
|
- ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro
|
||||||
- ../apps/openedx/config/:/openedx/config/:ro
|
- ../apps/openedx/config:/openedx/config:ro
|
||||||
- ../../data/cms:/openedx/data
|
- ../../data/cms:/openedx/data
|
||||||
- ../../data/openedx-media:/openedx/media
|
- ../../data/openedx-media:/openedx/media
|
||||||
depends_on:
|
depends_on:
|
||||||
|
Loading…
Reference in New Issue
Block a user