mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-09-21 17:09:03 +00:00
Compare commits
2 Commits
59b1987ff1
...
13c420cb0a
Author | SHA1 | Date | |
---|---|---|---|
|
13c420cb0a | ||
|
3401a71b18 |
1
changelog.d/20240222_101904_regis_fix_nightly_patches.md
Normal file
1
changelog.d/20240222_101904_regis_fix_nightly_patches.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
- [Bugfix] Fix merge conflicts in nightly when trying to apply patches from the master branch. (by @regisb)
|
@ -49,8 +49,10 @@ RUN git config --global user.email "tutor@overhang.io" \
|
|||||||
{%- if patch("openedx-dockerfile-git-patches-default") %}
|
{%- if patch("openedx-dockerfile-git-patches-default") %}
|
||||||
# Custom edx-platform patches
|
# Custom edx-platform patches
|
||||||
{{ patch("openedx-dockerfile-git-patches-default") }}
|
{{ patch("openedx-dockerfile-git-patches-default") }}
|
||||||
|
{%- elif EDX_PLATFORM_VERSION == "master" %}
|
||||||
|
# Patches in nightly node
|
||||||
{%- else %}
|
{%- else %}
|
||||||
# Patch edx-platform
|
# Patches in non-nightly mode
|
||||||
# Prevent course structure cache infinite growth
|
# Prevent course structure cache infinite growth
|
||||||
# https://github.com/openedx/edx-platform/pull/34210
|
# https://github.com/openedx/edx-platform/pull/34210
|
||||||
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/ad201cd664b6c722cbefcbda23ae390c06daf621.patch | git am
|
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/ad201cd664b6c722cbefcbda23ae390c06daf621.patch | git am
|
||||||
|
Loading…
Reference in New Issue
Block a user