mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-12-14 06:58:21 +00:00
Merge remote-tracking branch 'origin/master' into nightly
This commit is contained in:
commit
e942fca24f
@ -18,6 +18,7 @@ Every user-facing change should have an entry in this changelog. Please respect
|
||||
|
||||
## Unreleased
|
||||
|
||||
- [Feature] Add patch to allow overriding final openedx docker image CMD
|
||||
- [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!)
|
||||
- [Fix] Fix 500 error during studio login. (by @regisb)
|
||||
|
@ -266,6 +266,13 @@ Files: ``apps/openedx/settings/cms/development.py``, ``apps/openedx/settings/lms
|
||||
|
||||
File: ``build/openedx/Dockerfile``
|
||||
|
||||
.. patch:: openedx-dockerfile-final
|
||||
|
||||
``openedx-dockerfile-final``
|
||||
============================
|
||||
|
||||
File: ``build/openedx/Dockerfile``
|
||||
|
||||
.. patch:: openedx-dockerfile-git-patches-default
|
||||
|
||||
``openedx-dockerfile-git-patches-default``
|
||||
|
@ -246,3 +246,6 @@ CMD uwsgi \
|
||||
--processes=${UWSGI_WORKERS:-2} \
|
||||
--buffer-size=8192 \
|
||||
--wsgi-file $SERVICE_VARIANT/wsgi.py
|
||||
|
||||
{{ patch("openedx-dockerfile-final") }}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user