Skip to content

Commit 354dfc6

Browse files
DawoudSherazregisb
authored andcommitted
feat: update to redwood.2
1 parent 8aed225 commit 354dfc6

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- [Feature] Update to redwood.2 tag (by @dawoudsheraz)

docs/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Open edX customisation
132132

133133
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.
134134

135-
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/redwood.1"``, or ``master`` in :ref:`nightly <nightly>`)
135+
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/redwood.2"``, or ``master`` in :ref:`nightly <nightly>`)
136136

137137
This defines the default version that will be pulled from all Open edX git repositories.
138138

tutor/templates/build/openedx/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ RUN git config --global user.email "tutor@overhang.io" \
5353
# Patches in nightly node
5454
{%- else %}
5555
# Patches in non-nightly mode
56-
# Security patch around content library permissions
57-
# https://discuss.openedx.org/t/security-upcoming-security-release-for-edx-platform-2024-07-25/13473
58-
# https://github.com/openedx/edx-platform/pull/35180
59-
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/3160ff68ca4a4516375af3307fe84f22cd5e5b36.patch | git am
60-
6156
{%- endif %}
6257

6358
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}

tutor/templates/config/defaults.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2
6161
OPENEDX_MYSQL_DATABASE: "openedx"
6262
OPENEDX_MYSQL_USERNAME: "openedx"
6363
# the common version will be automatically set to "master" in the nightly branch
64-
OPENEDX_COMMON_VERSION: "open-release/redwood.1"
64+
OPENEDX_COMMON_VERSION: "open-release/redwood.2"
6565
OPENEDX_EXTRA_PIP_REQUIREMENTS: []
6666
MYSQL_HOST: "mysql"
6767
MYSQL_PORT: 3306

0 commit comments

Comments
 (0)