christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-12 14:17:46 +00:00
Code Issues Releases Activity

feat: Conditional edx-platform patching

Browse Source 
During Docker images build process, apply custom edx-platform patches when tutor patch 'openedx-dockerfile-git-patches-default' is defined or apply current release patches in other case. It avoids possible conflicts between the actually used edx-platform version and the current release patches.
This commit is contained in:
Eric Herrera 2021-04-14 12:57:22 -05:00 committed by Régis Behmo
parent a05486e7b0
commit 17088e2fc6
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -3,7 +3,9 @@
Note: Breaking changes between versions are indicated by "💥". Note: Breaking changes between versions are indicated by "💥".
## Unreleased ## Unreleased
- [Feature] Add patches to extend python requirements installation process in openedx and openedx-dev Dockerfiles. - [Feature] Add patches to extend python requirements installation process in openedx and openedx-dev Dockerfiles.
- [Improvement] Apply edx-platform patches during Docker image build using tutor patch 'openedx-dockerfile-git-patches-default'.
## v11.2.6 (2021-04-09) ## v11.2.6 (2021-04-09)

5
tutor/templates/build/openedx/Dockerfile
View File

@ -35,6 +35,10 @@ RUN mkdir -p /openedx/edx-platform && \
git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 /openedx/edx-platform git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 /openedx/edx-platform
WORKDIR /openedx/edx-platform WORKDIR /openedx/edx-platform
{% if patch("openedx-dockerfile-git-patches-default") %}
# Custom edx-platform default patches
{{ patch("openedx-dockerfile-git-patches-default") }}
{% else %}
# Patch edx-platform # Patch edx-platform
# Make it possible to disable learner records globally # Make it possible to disable learner records globally
# https://github.com/edx/edx-platform/pull/25182 # https://github.com/edx/edx-platform/pull/25182
@ -48,6 +52,7 @@ RUN curl https://github.com/overhangio/edx-platform/commit/bc0ab09f9945bd14aa6be
# https://github.com/edx/edx-platform/pull/25957 # https://github.com/edx/edx-platform/pull/25957
# https://github.com/overhangio/edx-platform/tree/overhangio/upgrade-django-pipeline # https://github.com/overhangio/edx-platform/tree/overhangio/upgrade-django-pipeline
RUN curl https://github.com/overhangio/edx-platform/commit/1c733e3ba11249cf16358684169e6137a308e796.patch | git apply - RUN curl https://github.com/overhangio/edx-platform/commit/1c733e3ba11249cf16358684169e6137a308e796.patch | git apply -
{% endif %}
###### Download extra locales to /openedx/locale/contrib/locale ###### Download extra locales to /openedx/locale/contrib/locale
FROM minimal as locales FROM minimal as locales