From 6674e267dea9156de99eb46a9146d68b82e69c53 Mon Sep 17 00:00:00 2001 From: Sofiane Bebert Date: Tue, 9 Aug 2022 20:59:16 +0100 Subject: [PATCH] feat: upgrade all apps to open-release/nutmeg.2 --- CHANGELOG.md | 2 ++ tutor/templates/build/openedx/Dockerfile | 6 ------ tutor/templates/config/defaults.yml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc9a400..9d887ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ Every user-facing change should have an entry in this changelog. Please respect ## Unreleased +- [Feature] Upgrade all applications to open-release/nutmeg.2. + ## v14.0.4 (2022-07-29) - [Feature] Add the `-m/--mount` option to `tutor dev quickstart`. diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index e86afce..5d8e830 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 "Pages" view in Studio # https://github.com/openedx/edx-platform/pull/30550 RUN curl -fsSL https://github.com/open-craft/edx-platform/commit/3d54f284f82b61e693ad652d8d6e46a226fcb36d.patch | git am -# fix: add () to print statement so problem with hint template works in newer versions -# https://github.com/openedx/edx-platform/pull/30585 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/468036b3085adbe77a2dbb4a1c3bd88ab831f7b0.patch | git am -# Fix LTI 1.3 Names & Roles and Grades conflict with DarkLangMiddleware -# https://github.com/openedx/edx-platform/pull/30716 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/531bc54833dc97244b408f9f443d2b036f474f0d.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 359d71b..6a797e8 100644 --- a/tutor/templates/config/defaults.yml +++ b/tutor/templates/config/defaults.yml @@ -48,7 +48,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/nutmeg.1" +OPENEDX_COMMON_VERSION: "open-release/nutmeg.2" OPENEDX_EXTRA_PIP_REQUIREMENTS: - "openedx-scorm-xblock<14.0.0,>=13.0.0" MYSQL_HOST: "mysql"