From 0887691cc488f0a4b7f8396871b5cbc5f09a55a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Wed, 12 Apr 2023 21:46:04 +0200 Subject: [PATCH 1/2] feat: upgrade to open-release/olive.3 --- docs/configuration.rst | 2 +- tutor/templates/build/openedx/Dockerfile | 4 ---- tutor/templates/config/defaults.yml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 235889e..272b5ea 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.2"``) +- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.3"``) 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 e3d1633..31aafd6 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -41,10 +41,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 - -# Use supported YouTube API for transcripts imports -# https://github.com/openedx/edx-platform/pull/31862 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/210dd1d7c211e531b9bc4376d1692a0bb0e6b651.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 9497c96..95d2b8f 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.2" +OPENEDX_COMMON_VERSION: "open-release/olive.3" OPENEDX_EXTRA_PIP_REQUIREMENTS: - "openedx-scorm-xblock>=15.0.0,<16.0.0" MYSQL_HOST: "mysql" From b02c4b93bb44b14181ce9bb17181fc12cb76b045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 13 Apr 2023 08:32:40 +0200 Subject: [PATCH 2/2] docs: add missing changelog entry --- changelog.d/20230412_190647_regis.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/20230412_190647_regis.md diff --git a/changelog.d/20230412_190647_regis.md b/changelog.d/20230412_190647_regis.md new file mode 100644 index 0000000..be36f8b --- /dev/null +++ b/changelog.d/20230412_190647_regis.md @@ -0,0 +1 @@ +- [Feature] Upgrade to open-release/olive.3. (by @regisb)