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

feat: upgrade to nightly

Browse Source 
Get Tutor to work on the master branches of Open edX. The corresponding images
will have to be rebuilt manually. Note that the process to contribute to the
nightly branch is slightly different from the master branch (see the
instructions from the corresponding tutorial).
This commit is contained in:
Régis Behmo 2021-09-07 13:17:43 +02:00
parent 030d56f9af
commit c3c914f22f
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tutor/__about__.py
View File

@ -10,7 +10,7 @@ __version__ = "12.1.4"
# the nightly branch. # the nightly branch.
# The suffix is cleanly separated from the __version__ in this module to avoid # The suffix is cleanly separated from the __version__ in this module to avoid
# conflicts when merging branches. # conflicts when merging branches.
__version_suffix__ = "" __version_suffix__ = "nightly"
# The app name will be used to define the name of the default tutor root and # The app name will be used to define the name of the default tutor root and
# plugin directory. To avoid conflicts between multiple locally-installed # plugin directory. To avoid conflicts between multiple locally-installed

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

@ -44,8 +44,6 @@ RUN git config --global user.email "tutor@overhang.io" \
{{ patch("openedx-dockerfile-git-patches-default") }} {{ patch("openedx-dockerfile-git-patches-default") }}
{% else %} {% else %}
# Patch edx-platform # Patch edx-platform
# Security patch: https://github.com/edx/edx-platform/pull/28442
RUN git fetch https://github.com/edx/edx-platform 8ecc1903ca9170a719c0e63e99fb231822eb26d8 && git cherry-pick 8ecc1903ca9170a719c0e63e99fb231822eb26d8
{% endif %} {% endif %}
{# Example: RUN git fetch https://github.com/edx/edx-platform <GITSHA1> && git cherry-pick <GITSHA1> #} {# Example: RUN git fetch https://github.com/edx/edx-platform <GITSHA1> && git cherry-pick <GITSHA1> #}
@ -75,7 +73,7 @@ COPY --from=code /openedx/edx-platform /openedx/edx-platform
WORKDIR /openedx/edx-platform WORKDIR /openedx/edx-platform
# Install the right version of pip/setuptools # Install the right version of pip/setuptools
RUN pip install setuptools==44.1.0 pip==20.0.2 wheel==0.34.2 RUN pip install setuptools==44.1.0 pip==20.3.4 wheel==0.37.0
# Install base requirements # Install base requirements
RUN pip install -r ./requirements/edx/base.txt RUN pip install -r ./requirements/edx/base.txt
@ -84,7 +82,7 @@ RUN pip install -r ./requirements/edx/base.txt
RUN pip install "openedx-scorm-xblock<13.0.0,>=12.0.0" RUN pip install "openedx-scorm-xblock<13.0.0,>=12.0.0"
# Install django-redis for using redis as a django cache # Install django-redis for using redis as a django cache
RUN pip install django-redis==4.12.1 RUN pip install django-redis==5.0.0
# Install uwsgi # Install uwsgi
RUN pip install uwsgi==2.0.19.1 RUN pip install uwsgi==2.0.19.1

8
tutor/templates/config.yml
View File

@ -31,10 +31,10 @@ DOCKER_IMAGE_OPENEDX_DEV: "{{ DOCKER_REGISTRY }}overhangio/openedx-dev:{{ TUTOR_
DOCKER_IMAGE_CADDY: "{{ DOCKER_REGISTRY }}caddy:2.3.0" DOCKER_IMAGE_CADDY: "{{ DOCKER_REGISTRY }}caddy:2.3.0"
DOCKER_IMAGE_FORUM: "{{ DOCKER_REGISTRY }}overhangio/openedx-forum:{{ TUTOR_VERSION }}" DOCKER_IMAGE_FORUM: "{{ DOCKER_REGISTRY }}overhangio/openedx-forum:{{ TUTOR_VERSION }}"
DOCKER_IMAGE_MONGODB: "{{ DOCKER_REGISTRY }}mongo:4.0.25" DOCKER_IMAGE_MONGODB: "{{ DOCKER_REGISTRY }}mongo:4.0.25"
DOCKER_IMAGE_MYSQL: "{{ DOCKER_REGISTRY }}mysql:5.7.33" DOCKER_IMAGE_MYSQL: "{{ DOCKER_REGISTRY }}mysql:5.7.35"
DOCKER_IMAGE_ELASTICSEARCH: "{{ DOCKER_REGISTRY }}elasticsearch:7.8.1" DOCKER_IMAGE_ELASTICSEARCH: "{{ DOCKER_REGISTRY }}elasticsearch:7.8.1"
DOCKER_IMAGE_NGINX: "{{ DOCKER_REGISTRY }}nginx:1.19.9" DOCKER_IMAGE_NGINX: "{{ DOCKER_REGISTRY }}nginx:1.21.1"
DOCKER_IMAGE_REDIS: "{{ DOCKER_REGISTRY }}redis:6.2.1" DOCKER_IMAGE_REDIS: "{{ DOCKER_REGISTRY }}redis:6.2.5"
DOCKER_IMAGE_SMTP: "{{ DOCKER_REGISTRY }}namshi/smtp:latest" DOCKER_IMAGE_SMTP: "{{ DOCKER_REGISTRY }}namshi/smtp:latest"
LOCAL_PROJECT_NAME: "{{ TUTOR_APP }}_local" LOCAL_PROJECT_NAME: "{{ TUTOR_APP }}_local"
ELASTICSEARCH_HOST: "elasticsearch" ELASTICSEARCH_HOST: "elasticsearch"
@ -61,7 +61,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2
OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_DATABASE: "openedx"
OPENEDX_CSMH_MYSQL_DATABASE: "{{ OPENEDX_MYSQL_DATABASE }}_csmh" OPENEDX_CSMH_MYSQL_DATABASE: "{{ OPENEDX_MYSQL_DATABASE }}_csmh"
OPENEDX_MYSQL_USERNAME: "openedx" OPENEDX_MYSQL_USERNAME: "openedx"
OPENEDX_COMMON_VERSION: "open-release/lilac.2" OPENEDX_COMMON_VERSION: "master"
MYSQL_HOST: "mysql" MYSQL_HOST: "mysql"
MYSQL_PORT: 3306 MYSQL_PORT: 3306
MYSQL_ROOT_USERNAME: "root" MYSQL_ROOT_USERNAME: "root"