From 6d18ccc632274e7a2d2236075b344f63c56e6225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 9 Sep 2021 16:25:07 +0200 Subject: [PATCH] feat: add "openedx-dockerfile-post-git-checkout" patch This will be convenient for plugins which need to patch edx-platform. --- CHANGELOG.md | 1 + tutor/templates/build/openedx/Dockerfile | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62df21a..5ee9b2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- [Feature] Add "openedx-dockerfile-post-git-checkout" patch. - [Improvement] In the "openedx" Docker images, convert git patches to cherry-picks for a cleaner source tree. - 💥[Feature] Make it possible to override local job configuration. This deprecates the older model for running jobs which dates back from a long time ago. diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 429f9ed..881ac46 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -48,6 +48,9 @@ RUN git config --global user.email "tutor@overhang.io" \ RUN git fetch https://github.com/edx/edx-platform 8ecc1903ca9170a719c0e63e99fb231822eb26d8 && git cherry-pick 8ecc1903ca9170a719c0e63e99fb231822eb26d8 {% endif %} +{# Example: RUN git fetch https://github.com/edx/edx-platform && git cherry-pick #} +{{ patch("openedx-dockerfile-post-git-checkout") }} + ###### Download extra locales to /openedx/locale/contrib/locale FROM minimal as locales ARG OPENEDX_I18N_VERSION={{ OPENEDX_COMMON_VERSION }}