From 91385ba8d7b335748e8b1daeaf24d46769871a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Fri, 10 Feb 2023 10:54:12 +0100 Subject: [PATCH] feat: upgrade to open-release/olive.2 --- changelog.d/20230210_104512_regis_olive_2.md | 1 + docs/configuration.rst | 2 +- tutor/templates/build/openedx/Dockerfile | 6 ------ tutor/templates/config/defaults.yml | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) create mode 100644 changelog.d/20230210_104512_regis_olive_2.md diff --git a/changelog.d/20230210_104512_regis_olive_2.md b/changelog.d/20230210_104512_regis_olive_2.md new file mode 100644 index 0000000..dc28cbb --- /dev/null +++ b/changelog.d/20230210_104512_regis_olive_2.md @@ -0,0 +1 @@ +- [Feature] Upgrade all Open edX services to open-release/olive.2. (by @regisb) diff --git a/docs/configuration.rst b/docs/configuration.rst index 92ca091..b73beb5 100644 --- a/docs/configuration.rst +++ b/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. diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 275b2b4..b78e6b7 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/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/ | git am #} diff --git a/tutor/templates/config/defaults.yml b/tutor/templates/config/defaults.yml index 7c1cf17..9497c96 100644 --- a/tutor/templates/config/defaults.yml +++ b/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"