diff --git a/CHANGELOG.md b/CHANGELOG.md index e1ae4d4..494be87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- [Improvement] Upgrade all services to open-release/lilac.2. - [Bugfix] Fix "`sh` is not a recognized command" in some plugins, including minio. ## v12.0.2 (2021-07-06) diff --git a/docs/configuration.rst b/docs/configuration.rst index dd98dd3..80f73bd 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -79,7 +79,7 @@ You may want to pull/push images from/to a custom docker registry. For instance, Open edX customisation ~~~~~~~~~~~~~~~~~~~~~~ -- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/lilac.1"``) +- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/lilac.2"``) This defines the default version that will be pulled from all Open edX git repositories. @@ -220,7 +220,7 @@ openedx Docker Image build arguments When building the "openedx" Docker image, it is possible to specify a few `arguments `__: - ``EDX_PLATFORM_REPOSITORY`` (default: ``"https://github.com/edx/edx-platform.git"``) -- ``EDX_PLATFORM_VERSION`` (default: ``"open-release/lilac.1"``) +- ``EDX_PLATFORM_VERSION`` (default: ``"{{ OPENEDX_COMMON_VERSION }}"``) - ``NPM_REGISTRY`` (default: ``"https://registry.npmjs.org/"``) These arguments can be specified from the command line, `very much like Docker `__. For instance:: diff --git a/docs/dev.rst b/docs/dev.rst index ced2dd1..a0723c9 100644 --- a/docs/dev.rst +++ b/docs/dev.rst @@ -137,7 +137,7 @@ Prepare the edx-platform repo If you choose any but the first solution above, you will have to make sure that your fork works with Tutor. -First of all, you should make sure that you are working off the ``open-release/lilac.1`` tag. See the :ref:`fork edx-platform section ` for more information. +First of all, you should make sure that you are working off the ``open-release/lilac.2`` tag. See the :ref:`fork edx-platform section ` for more information. Then, you should run the following commands:: diff --git a/tutor/templates/config.yml b/tutor/templates/config.yml index a7495f9..cab9dce 100644 --- a/tutor/templates/config.yml +++ b/tutor/templates/config.yml @@ -60,7 +60,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2 OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_CSMH_MYSQL_DATABASE: "{{ OPENEDX_MYSQL_DATABASE }}_csmh" OPENEDX_MYSQL_USERNAME: "openedx" -OPENEDX_COMMON_VERSION: "open-release/lilac.1" +OPENEDX_COMMON_VERSION: "open-release/lilac.2" MYSQL_HOST: "mysql" MYSQL_PORT: 3306 MYSQL_ROOT_USERNAME: "root"