diff --git a/CHANGELOG.md b/CHANGELOG.md index d635c05..648e748 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- [Security] Timed exam security fix [29347](https://github.com/edx/edx-platform/pull/29347). - [Feature] Add [tutor-richie](https://github.com/overhangio/tutor-richie) to the plugins that are bundled with the tutor binary. - [Improvement] Make `tutor plugins list` print plugins sorted by name. - [Improvement] Ignore Python plugins which cannot be loaded. diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index a71a65a..1da4334 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -44,9 +44,12 @@ RUN git config --global user.email "tutor@overhang.io" \ {{ patch("openedx-dockerfile-git-patches-default") }} {% else %} # Patch edx-platform +# edx-proctoring security fix https://github.com/edx/edx-platform/pull/29347/ +RUN git fetch --depth=2 https://github.com/edx/edx-platform d61dcac29d1651956623c150be53a8bbe69e9346 \ + && git cherry-pick d61dcac29d1651956623c150be53a8bbe69e9346 {% endif %} -{# Example: RUN git fetch https://github.com/edx/edx-platform && git cherry-pick #} +{# Example: RUN git fetch --depth=2 https://github.com/edx/edx-platform && git cherry-pick #} {{ patch("openedx-dockerfile-post-git-checkout") }} ###### Download extra locales to /openedx/locale/contrib/locale