fix: disable Docker patches for tutor as they don't apply cleanly
Description
This PR comments out the commits from the the tutor Dockerfile as they don't apply cleanly.
https://github.com/overhangio/tutor/blob/master/tutor/templates/build/openedx/Dockerfile#L47
Step 23/103 : RUN curl -fsSL https://github.com/openedx/edx-platform/commit/468036b3085adbe77a2dbb4a1c3bd88ab831f7b0.patch | git am
---> Running in 626ffc40b401
error: patch failed: common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml:11
error: common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: fix: add () to print statement so template works in newer versions
Patch failed at 0001 fix: add () to print statement so template works in newer versions
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
The command '/bin/sh -c curl -fsSL https://github.com/openedx/edx-platform/commit/468036b3085adbe77a2dbb4a1c3bd88ab831f7b0.patch | git am' returned a non-zero code: 128
Error: Command failed with status 128: docker build -t docker.io/overhangio/openedx:14.0.4 /home/keith/.local/share/tutor/env/build/openedx
Testing instructions
If you already have tutor
installed make sure this plugin is not installed/disabled.
-
tutor config save --set OPENEDX_COMMON_VERSION=open-release/nutmeg.master
# Make sure that we're building nutmeg.master tutor images build openedx
This command will fail.
- Add the plugin with
pip install git+https://gitlab.com/opencraft/dev/tutor-contrib-grove.git@keith/remove-docker-patches
- Enable the plugin
tutor plugins enable grove
tutor config save
And run the above again. The image build will be able to continue after this step.
Edited by Keith Grootboom