From 439b7d08f0585dd765feb4e2f450ea4bea82320e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Fri, 9 Feb 2024 22:15:43 +0100 Subject: [PATCH] feat: upgrade to quince.2 --- changelog.d/20240209_220759_regis.md | 1 + tutor/templates/build/openedx/Dockerfile | 2 -- tutor/templates/config/defaults.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 changelog.d/20240209_220759_regis.md diff --git a/changelog.d/20240209_220759_regis.md b/changelog.d/20240209_220759_regis.md new file mode 100644 index 0000000..bb40ed3 --- /dev/null +++ b/changelog.d/20240209_220759_regis.md @@ -0,0 +1 @@ +- [Improvement] Upgrade base release to open-release/quince.2. (by @regisb) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 51e7db4..0aef8e8 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -51,8 +51,6 @@ RUN git config --global user.email "tutor@overhang.io" \ {{ patch("openedx-dockerfile-git-patches-default") }} {%- else %} # Patch edx-platform -# XBlock JWT security fix https://github.com/openedx/edx-platform/pull/34047 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/89f5f69682a5e1422f89e867491e8974dd0a8208.patch | git am {%- endif %} {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/.patch | git am #} diff --git a/tutor/templates/config/defaults.yml b/tutor/templates/config/defaults.yml index 9ab1967..d0d3a31 100644 --- a/tutor/templates/config/defaults.yml +++ b/tutor/templates/config/defaults.yml @@ -59,7 +59,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2 OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_USERNAME: "openedx" # the common version will be automatically set to "master" in the nightly branch -OPENEDX_COMMON_VERSION: "open-release/quince.1" +OPENEDX_COMMON_VERSION: "open-release/quince.2" OPENEDX_EXTRA_PIP_REQUIREMENTS: [] MYSQL_HOST: "mysql" MYSQL_PORT: 3306