christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-24 14:08:23 +00:00
Code Issues Releases Activity

feat: update to redwood.2

Browse Source
This commit is contained in:
Syed Muhammad Dawoud Sheraz Ali 2024-08-12 12:06:31 +05:00 committed by Régis Behmo
parent 8aed2251fd
commit 354dfc654d
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md Normal file
View File

@ -0,0 +1 @@
- [Feature] Update to redwood.2 tag (by @dawoudsheraz)

2
docs/configuration.rst
View File

@ -132,7 +132,7 @@ Open edX customisation
This defines the git repository from which you install Open edX platform code. If you run an Open edX fork with custom patches, set this to your own git repository. You may also override this configuration parameter at build time, by providing a ``--build-arg`` option. This defines the git repository from which you install Open edX platform code. If you run an Open edX fork with custom patches, set this to your own git repository. You may also override this configuration parameter at build time, by providing a ``--build-arg`` option.
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/redwood.1"``, or ``master`` in :ref:`nightly <nightly>`) - ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/redwood.2"``, or ``master`` in :ref:`nightly <nightly>`)
This defines the default version that will be pulled from all Open edX git repositories. This defines the default version that will be pulled from all Open edX git repositories.

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

@ -53,11 +53,6 @@ RUN git config --global user.email "tutor@overhang.io" \
# Patches in nightly node # Patches in nightly node
{%- else %} {%- else %}
# Patches in non-nightly mode # Patches in non-nightly mode
# Security patch around content library permissions
# https://discuss.openedx.org/t/security-upcoming-security-release-for-edx-platform-2024-07-25/13473
# https://github.com/openedx/edx-platform/pull/35180
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/3160ff68ca4a4516375af3307fe84f22cd5e5b36.patch | git am
{%- endif %} {%- endif %}
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #} {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}

2
tutor/templates/config/defaults.yml
View File

@ -61,7 +61,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2
OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_DATABASE: "openedx"
OPENEDX_MYSQL_USERNAME: "openedx" OPENEDX_MYSQL_USERNAME: "openedx"
# the common version will be automatically set to "master" in the nightly branch # the common version will be automatically set to "master" in the nightly branch
OPENEDX_COMMON_VERSION: "open-release/redwood.1" OPENEDX_COMMON_VERSION: "open-release/redwood.2"
OPENEDX_EXTRA_PIP_REQUIREMENTS: [] OPENEDX_EXTRA_PIP_REQUIREMENTS: []
MYSQL_HOST: "mysql" MYSQL_HOST: "mysql"
MYSQL_PORT: 3306 MYSQL_PORT: 3306