diff --git a/CHANGELOG.md b/CHANGELOG.md index df1cf2e..d134fbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- [Improvement] Upgrade all services to open-release/lilac.3. - [Feature] Make it possible to override job configuration in development: if they exist, `dev/docker-compose.jobs.yml` and `dev/docker-compose.jobs.override.yml` will be loaded when running jobs. - [Improvement] Faster `tutor local start` by building only necessary images. diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 881ac46..a71a65a 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -44,8 +44,6 @@ RUN git config --global user.email "tutor@overhang.io" \ {{ patch("openedx-dockerfile-git-patches-default") }} {% else %} # 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 %} {# Example: RUN git fetch https://github.com/edx/edx-platform && git cherry-pick #} diff --git a/tutor/templates/config.yml b/tutor/templates/config.yml index e46af60..eaa6b92 100644 --- a/tutor/templates/config.yml +++ b/tutor/templates/config.yml @@ -61,7 +61,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/lilac.2" +OPENEDX_COMMON_VERSION: "open-release/lilac.3" MYSQL_HOST: "mysql" MYSQL_PORT: 3306 MYSQL_ROOT_USERNAME: "root"