Merge remote-tracking branch 'origin/release'

overhangio · Feb 4, 2025 · 5217bef · 5217bef
2 parents eb9e171 + be5a504
commit 5217bef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...og.d/20250203_192055_danyal.faheem_allow_installing_scorm_xblock_using_patch.md b/...og.d/20250203_192055_danyal.faheem_allow_installing_scorm_xblock_using_patch.md
@@ -0,0 +1 @@
+- [Improvement] Allow installing custom openedx-scorm-xblock using the openedx-dockerfile-post-python-requirements patch. (by @Danyal-Faheem)
diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile
@@ -112,11 +112,11 @@ RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     UWSGI_PROFILE_OVERRIDE="xml=no" \
     pip install --no-cache-dir --compile uwsgi==2.0.24
 
-{{ patch("openedx-dockerfile-post-python-requirements") }}
-
 # Install scorm xblock
 RUN pip install "openedx-scorm-xblock>=19.0.0,<20.0.0"
 
+{{ patch("openedx-dockerfile-post-python-requirements") }}
+
 {% for extra_requirements in OPENEDX_EXTRA_PIP_REQUIREMENTS %}
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     pip install '{{ extra_requirements }}'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Improvement] Allow installing custom openedx-scorm-xblock using the openedx-dockerfile-post-python-requirements patch. (by @Danyal-Faheem)