feat: upgrade to open-release/olive.2

changelog.d/20230210_104512_regis_olive_2.md

@@ -0,0 +1 @@
+- [Feature] Upgrade all Open edX services to open-release/olive.2. (by @regisb)

docs/configuration.rst

@@ -130,7 +130,7 @@ Open edX customisation
 
 This defines the git repository from which you install Open edX platform code. If you run an Open edX fork with custom patches, set this to your own git repository. You may also override this configuration parameter at build time, by providing a ``--build-arg`` option.
 
-- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.1"``)
+- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.2"``)
 
 This defines the default version that will be pulled from all Open edX git repositories.
 

tutor/templates/build/openedx/Dockerfile

@@ -50,12 +50,6 @@ RUN git config --global user.email "tutor@overhang.io" \
 # Fix broken Circuit Schematic Builder problem template
 # https://github.com/openedx/edx-platform/pull/31365
 RUN curl -fsSL https://github.com/openedx/edx-platform/commit/20b93b8b01276edadddfbbb67f15714fddd81c31.patch | git am
-# Fix TinyMCE editor for html components
-# https://github.com/openedx/edx-platform/pull/31500
-RUN curl -fsSL https://github.com/openedx/edx-platform/commit/5af42f8ba3.patch | git am
-# Fix security issue in lti-consumer-xblock
-# https://github.com/openedx/edx-platform/pull/31724
-RUN curl -fsSL https://github.com/openedx/edx-platform/commit/5f901a35d2.patch | git am
 {%- endif %}
 
 {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1> | git am #}

tutor/templates/config/defaults.yml

@@ -51,7 +51,7 @@ OPENEDX_CMS_UWSGI_WORKERS: 2
 OPENEDX_LMS_UWSGI_WORKERS: 2
 OPENEDX_MYSQL_DATABASE: "openedx"
 OPENEDX_MYSQL_USERNAME: "openedx"
-OPENEDX_COMMON_VERSION: "open-release/olive.1"
+OPENEDX_COMMON_VERSION: "open-release/olive.2"
 OPENEDX_EXTRA_PIP_REQUIREMENTS:
   - "openedx-scorm-xblock>=15.0.0,<16.0.0"
 MYSQL_HOST: "mysql"