From a6338e2880700b57ad6574a41de883de63505272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Wed, 9 Aug 2023 22:41:34 +0200 Subject: [PATCH] feat: upgrade to open-release/palm.2 --- changelog.d/20230809_221139_regis.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/20230809_221139_regis.md diff --git a/changelog.d/20230809_221139_regis.md b/changelog.d/20230809_221139_regis.md new file mode 100644 index 0000000..dce9938 --- /dev/null +++ b/changelog.d/20230809_221139_regis.md @@ -0,0 +1 @@ +- [Improvement] Upgrade the Open edX default version to open-release/palm.2. (by @regisb) diff --git a/docs/configuration.rst b/docs/configuration.rst index c636939..15543af 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -136,7 +136,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/palm.1"``) +- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/palm.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 097d749..abfe968 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" \ {{ patch("openedx-dockerfile-git-patches-default") }} {%- else %} # Patch edx-platform -# Security advisory: https://github.com/openedx/edx-platform/security/advisories/GHSA-3q74-3rfh-g37j -# https://github.com/openedx/edx-platform/pull/32838 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/163259779297a7dccb28e1f8c3dfa4d2cbdb9655.patch | git am -# Fix discussion units when forum is not enabled -# https://github.com/openedx/edx-platform/pull/32464 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/a9f66705503288c360055ab80c7c3bfb884f75fe.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 29996e4..5a8399b 100644 --- a/tutor/templates/config/defaults.yml +++ b/tutor/templates/config/defaults.yml @@ -52,7 +52,7 @@ OPENEDX_CMS_UWSGI_WORKERS: 2 OPENEDX_LMS_UWSGI_WORKERS: 2 OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_USERNAME: "openedx" -OPENEDX_COMMON_VERSION: "open-release/palm.1" +OPENEDX_COMMON_VERSION: "open-release/palm.2" OPENEDX_EXTRA_PIP_REQUIREMENTS: - "openedx-scorm-xblock>=16.0.0,<17.0.0" MYSQL_HOST: "mysql"