christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-12 14:17:46 +00:00
Code Issues Releases Activity

feat: upgrade to open-release/olive.3

Browse Source
This commit is contained in:
Régis Behmo 2023-04-12 21:46:04 +02:00 committed by GitHub
parent cb29a86a65
commit 0887691cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuration.rst
View File

@ -130,7 +130,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/olive.2"``) - ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.3"``)
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.

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

@ -41,10 +41,6 @@ RUN git config --global user.email "tutor@overhang.io" \
# Fix broken Circuit Schematic Builder problem template # Fix broken Circuit Schematic Builder problem template
# https://github.com/openedx/edx-platform/pull/31365 # https://github.com/openedx/edx-platform/pull/31365
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/20b93b8b01276edadddfbbb67f15714fddd81c31.patch | git am RUN curl -fsSL https://github.com/openedx/edx-platform/commit/20b93b8b01276edadddfbbb67f15714fddd81c31.patch | git am
# Use supported YouTube API for transcripts imports
# https://github.com/openedx/edx-platform/pull/31862
RUN curl -fsSL https://github.com/openedx/edx-platform/commit/210dd1d7c211e531b9bc4376d1692a0bb0e6b651.patch | git am
{%- endif %} {%- endif %}
{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1> | git am #} {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1> | git am #}

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

@ -51,7 +51,7 @@ OPENEDX_CMS_UWSGI_WORKERS: 2
OPENEDX_LMS_UWSGI_WORKERS: 2 OPENEDX_LMS_UWSGI_WORKERS: 2
OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_DATABASE: "openedx"
OPENEDX_MYSQL_USERNAME: "openedx" OPENEDX_MYSQL_USERNAME: "openedx"
OPENEDX_COMMON_VERSION: "open-release/olive.2" OPENEDX_COMMON_VERSION: "open-release/olive.3"
OPENEDX_EXTRA_PIP_REQUIREMENTS: OPENEDX_EXTRA_PIP_REQUIREMENTS:
- "openedx-scorm-xblock>=15.0.0,<16.0.0" - "openedx-scorm-xblock>=15.0.0,<16.0.0"
MYSQL_HOST: "mysql" MYSQL_HOST: "mysql"