christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-06 07:30:40 +00:00
Code Issues Releases Activity

feat: upgrade to open-release/palm.2

Browse Source
This commit is contained in:
Régis Behmo 2023-08-09 22:41:34 +02:00
parent bb23afcc60
commit a6338e2880
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/20230809_221139_regis.md Normal file
View File

@ -0,0 +1 @@
- [Improvement] Upgrade the Open edX default version to open-release/palm.2. (by @regisb)

2
docs/configuration.rst
View File

@ -136,7 +136,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/palm.1"``)
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/palm.2"``)
This defines the default version that will be pulled from all Open edX git repositories.

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

@ -50,12 +50,6 @@ RUN git config --global user.email "tutor@overhang.io" \
{{ patch("openedx-dockerfile-git-patches-default") }}
{%- else %}
# Patch edx-platform
# Security advisory: https://github.com/openedx/edx-platform/security/advisories/GHSA-3q74-3rfh-g37j
# https://github.com/openedx/edx-platform/pull/32838
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/163259779297a7dccb28e1f8c3dfa4d2cbdb9655.patch | git am
# Fix discussion units when forum is not enabled
# https://github.com/openedx/edx-platform/pull/32464
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/a9f66705503288c360055ab80c7c3bfb884f75fe.patch | git am
{%- endif %}
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}

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

@ -52,7 +52,7 @@ OPENEDX_CMS_UWSGI_WORKERS: 2
OPENEDX_LMS_UWSGI_WORKERS: 2
OPENEDX_MYSQL_DATABASE: "openedx"
OPENEDX_MYSQL_USERNAME: "openedx"
OPENEDX_COMMON_VERSION: "open-release/palm.1"
OPENEDX_COMMON_VERSION: "open-release/palm.2"
OPENEDX_EXTRA_PIP_REQUIREMENTS:
- "openedx-scorm-xblock>=16.0.0,<17.0.0"
MYSQL_HOST: "mysql"