mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-12-12 14:17:46 +00:00
feat: upgrade all services to open-release/maple.2
This commit is contained in:
parent
ec2598e114
commit
156ef063ce
@ -4,6 +4,8 @@ Note: Breaking changes between versions are indicated by "💥".
|
||||
|
||||
## Unreleased
|
||||
|
||||
- [Improvement] Upgrade all services to open-release/maple.2.
|
||||
|
||||
## v13.1.4 (2022-02-08)
|
||||
|
||||
- [Security] Fix vulnerability in redirect url during authentication (see [commit](https://github.com/overhangio/edx-platform/commit/06550411e34c04376fa3d757e1f068f464f816e6)).
|
||||
|
@ -79,7 +79,7 @@ You may want to pull/push images from/to a custom docker registry. For instance,
|
||||
Open edX customisation
|
||||
~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/maple.1"``)
|
||||
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/maple.2"``)
|
||||
|
||||
This defines the default version that will be pulled from all Open edX git repositories.
|
||||
|
||||
|
@ -137,7 +137,7 @@ Following the instructions :ref:`above <bind_mounts>` on how to bind-mount direc
|
||||
|
||||
If you choose any but the first solution above, you will have to make sure that your fork works with Tutor.
|
||||
|
||||
First of all, you should make sure that you are working off the ``open-release/maple.1`` tag. See the :ref:`fork edx-platform section <edx_platform_fork>` for more information.
|
||||
First of all, you should make sure that you are working off the ``open-release/maple.2`` tag. See the :ref:`fork edx-platform section <edx_platform_fork>` for more information.
|
||||
|
||||
Then, you should run the following commands::
|
||||
|
||||
|
@ -44,29 +44,9 @@ RUN git config --global user.email "tutor@overhang.io" \
|
||||
{{ patch("openedx-dockerfile-git-patches-default") }}
|
||||
{% else %}
|
||||
# Patch edx-platform
|
||||
# Fix language cookie "samesite" attribute
|
||||
# https://github.com/openedx/edx-platform/pull/29621
|
||||
RUN git fetch --depth=2 https://github.com/regisb/edx-platform 51e0ec3b97ae5badbf947d53ac07bd5496c10cde && git cherry-pick 51e0ec3b97ae5badbf947d53ac07bd5496c10cde
|
||||
# Fix forum notification for questions
|
||||
# https://github.com/openedx/edx-platform/pull/29611
|
||||
RUN git fetch --depth=2 https://github.com/open-craft/edx-platform/ 03731f19459e558f188c06aac5cc9ca1bbc675c2 && git cherry-pick 03731f19459e558f188c06aac5cc9ca1bbc675c2
|
||||
# Security fixes: user search by email
|
||||
# https://github.com/openedx/edx-platform/pull/29675
|
||||
# https://github.com/overhangio/edx-platform/commit/b63c01fb38a60f4581bdecbc528fa64cc3d3ef0d
|
||||
RUN git fetch --depth=2 https://github.com/openedx/edx-platform/ 479243d9fe6f0765ba06b1b9eb4ad9ed78fcf97c && git cherry-pick 479243d9fe6f0765ba06b1b9eb4ad9ed78fcf97c
|
||||
RUN git fetch --depth=2 https://github.com/overhangio/edx-platform/ b63c01fb38a60f4581bdecbc528fa64cc3d3ef0d && git cherry-pick b63c01fb38a60f4581bdecbc528fa64cc3d3ef0d
|
||||
# Upgrade Django to 3.2.11
|
||||
# https://github.com/openedx/edx-platform/commit/85eb44445b8a6207b967bd4af5666e521a4af9b5
|
||||
RUN git fetch --depth=2 https://github.com/openedx/edx-platform/ 85eb44445b8a6207b967bd4af5666e521a4af9b5 && git cherry-pick 85eb44445b8a6207b967bd4af5666e521a4af9b5
|
||||
# Fix Internal Server Error/AttributeError in learning MFE
|
||||
# https://github.com/openedx/edx-platform/pull/29741
|
||||
RUN git fetch --depth=2 https://github.com/openedx/edx-platform/ a76a79f973ca05f3921fa2a3428fa7052868a725 && git cherry-pick a76a79f973ca05f3921fa2a3428fa7052868a725
|
||||
# Security fix: invalid enrollment error vulnerability
|
||||
# https://github.com/openedx/edx-platform/commit/a140c674799c527e961e37c5e46cb7dc1ffef5ac
|
||||
RUN git fetch --depth=2 https://github.com/openedx/edx-platform/ a140c674799c527e961e37c5e46cb7dc1ffef5ac && git cherry-pick a140c674799c527e961e37c5e46cb7dc1ffef5ac
|
||||
# Security fix: redirect url vulnerability
|
||||
# https://github.com/overhangio/edx-platform/commit/06550411e34c04376fa3d757e1f068f464f816e6
|
||||
RUN git fetch --depth=2 https://github.com/openedx/edx-platform/ 06550411e34c04376fa3d757e1f068f464f816e6 && git cherry-pick 06550411e34c04376fa3d757e1f068f464f816e6
|
||||
{% endif %}
|
||||
|
||||
{# Example: RUN git fetch --depth=2 https://github.com/openedx/edx-platform <GITSHA1> && git cherry-pick <GITSHA1> #}
|
||||
|
@ -46,7 +46,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2
|
||||
OPENEDX_MYSQL_DATABASE: "openedx"
|
||||
OPENEDX_CSMH_MYSQL_DATABASE: "{{ OPENEDX_MYSQL_DATABASE }}_csmh"
|
||||
OPENEDX_MYSQL_USERNAME: "openedx"
|
||||
OPENEDX_COMMON_VERSION: "open-release/maple.1"
|
||||
OPENEDX_COMMON_VERSION: "open-release/maple.2"
|
||||
OPENEDX_EXTRA_PIP_REQUIREMENTS:
|
||||
- "openedx-scorm-xblock<14.0.0,>=13.0.0"
|
||||
MYSQL_HOST: "mysql"
|
||||
|
Loading…
Reference in New Issue
Block a user