From 41b65b80d5c75bf9e9ea8895f0e38a1e4dfefe43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Tue, 10 Aug 2021 10:51:39 +0200
Subject: [PATCH] Upgrade to open-release/lilac.2

---
 CHANGELOG.md               | 1 +
 docs/configuration.rst     | 4 ++--
 docs/dev.rst               | 2 +-
 tutor/templates/config.yml | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

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 <https://docs.docker.com/engine/reference/builder/#arg>`__:
 
 - ``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 <https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg>`__. 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 <edx_platform_fork>` 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 <edx_platform_fork>` 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"