Skip to content

Commit 5dba841

Browse files
authored
fix: Cherry-pick three critical ulmo.1 fixes (#1348)
1 parent c7df56a commit 5dba841

File tree

5 files changed

+20
-4
lines changed

5 files changed

+20
-4
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ instructions, because git commits are used to generate release notes:
2020

2121
<!-- scriv-insert-here -->
2222

23+
<a id='changelog-21.0.1'></a>
24+
## v21.0.1 (2026-02-11)
25+
26+
- [Feature] Add support for mounting `openedx-platform`, the which is new name of `edx-platform`. Mounting by the old name, `edx-platform`, will continue to work for now as well (by @kdmccormick).
27+
28+
- [Bugfix] Upgrade edx-search to 4.4.0 to fix Catalog MFE (by @kdmccormick)
29+
- [Security] Upgrade Django from 5.2.7 to 5.2.11 (by @kdmccormick)
30+
- [Bugfix] Upgrade ora2 to address pkg\_resources build failure (by @kdmccormick)
31+
2332
<a id='changelog-21.0.0'></a>
2433
## v21.0.0 (2026-01-07)
2534

changelog.d/20260120_155642_ahmed.khalid_fix_release_workflow.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/20260127_104718_kdmccormick_openedx_platform.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

tutor/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Increment this version number to trigger a new release. See
44
# docs/tutor.html#versioning for information on the versioning scheme.
5-
__version__ = "21.0.0"
5+
__version__ = "21.0.1"
66

77
# The version suffix will be appended to the actual version, separated by a
88
# dash. Use this suffix to differentiate between the actual released version and

tutor/templates/build/openedx/Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,18 @@ RUN git config --global user.email "tutor@overhang.io" \
5858
# Patches in Main node
5959
{%- else %}
6060
# Patches in non-Main mode (i.e., Release mode)
61+
## Update edx-search to 4.4.0 to fix the Catalog MFE
62+
RUN curl -fsSL https://github.com/openedx/openedx-platform/commit/1db37f309f710fa54e2372b1a3ca6dbb9b05640f.patch | git am
63+
## Bump Django 5.2.7->5.2.11 for security fix
64+
RUN curl -fsSL https://github.com/openedx/openedx-platform/commit/5f95ef0ba14baf145652d93be33176c51f926c6e.patch | git am
65+
## Upgrade edx-ora2 to fix pkg_resources build error
66+
RUN curl -fsSL https://github.com/openedx/openedx-platform/commit/e05ed0afb1a291635a91efc8c1620d06858f65c6.patch | git am
6167
{%- endif %}
6268

63-
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}
69+
{# Add new patches like this: #}
70+
{# RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}
71+
{# Include a comment on why the patch is neccessary. #}
72+
6473
{{ patch("openedx-dockerfile-post-git-checkout") }}
6574

6675
##### Empty layer with just the repo at the root.

0 commit comments

Comments
 (0)