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

Merge remote-tracking branch 'origin/master' into nightly

Browse Source
This commit is contained in:
Overhang.IO 2022-05-30 09:10:54 +00:00
commit e942fca24f
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ Every user-facing change should have an entry in this changelog. Please respect
## Unreleased ## Unreleased
- [Feature] Add patch to allow overriding final openedx docker image CMD
- [Fix] Ignore Python plugins that cannot be loaded. (by @regisb) - [Fix] Ignore Python plugins that cannot be loaded. (by @regisb)
- [Improvement] Faster and more reliable builds with `npm clean-install` instead of `npm install`. (by @regisb. Thanks @ghassanmas!) - [Improvement] Faster and more reliable builds with `npm clean-install` instead of `npm install`. (by @regisb. Thanks @ghassanmas!)
- [Fix] Fix 500 error during studio login. (by @regisb) - [Fix] Fix 500 error during studio login. (by @regisb)

7
docs/reference/patches.rst
View File

@ -266,6 +266,13 @@ Files: ``apps/openedx/settings/cms/development.py``, ``apps/openedx/settings/lms
File: ``build/openedx/Dockerfile`` File: ``build/openedx/Dockerfile``
.. patch:: openedx-dockerfile-final
``openedx-dockerfile-final``
============================
File: ``build/openedx/Dockerfile``
.. patch:: openedx-dockerfile-git-patches-default .. patch:: openedx-dockerfile-git-patches-default
``openedx-dockerfile-git-patches-default`` ``openedx-dockerfile-git-patches-default``

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

@ -246,3 +246,6 @@ CMD uwsgi \
--processes=${UWSGI_WORKERS:-2} \ --processes=${UWSGI_WORKERS:-2} \
--buffer-size=8192 \ --buffer-size=8192 \
--wsgi-file $SERVICE_VARIANT/wsgi.py --wsgi-file $SERVICE_VARIANT/wsgi.py
{{ patch("openedx-dockerfile-final") }}