Skip to content

Commit

Permalink
feat: update to redwood.2
Browse files Browse the repository at this point in the history
  • Loading branch information
DawoudSheraz authored and regisb committed Aug 13, 2024
1 parent 8aed225 commit 354dfc6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
1 change: 1 addition & 0 deletions changelog.d/20240812_112508_dawoud.sheraz_redwood_2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- [Feature] Update to redwood.2 tag (by @dawoudsheraz)
2 changes: 1 addition & 1 deletion docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

- ``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.

Expand Down
5 changes: 0 additions & 5 deletions tutor/templates/build/openedx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ RUN git config --global user.email "tutor@overhang.io" \
# Patches in nightly node
{%- else %}
# 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 %}

{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}
Expand Down
2 changes: 1 addition & 1 deletion tutor/templates/config/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2
OPENEDX_MYSQL_DATABASE: "openedx"
OPENEDX_MYSQL_USERNAME: "openedx"
# 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: []
MYSQL_HOST: "mysql"
MYSQL_PORT: 3306
Expand Down

0 comments on commit 354dfc6

Please sign in to comment.