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

Introduce the OPENEDX_COMMON_VERSION setting

Browse Source
This commit is contained in:
Régis Behmo 2020-09-03 17:33:25 +02:00
parent 39d146d477
commit ea3839eb74
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥".
## Unreleased ## Unreleased
- [Improvement] Introduce the `OPENEDX_COMMON_VERSION` setting
- [Bugfix] Make it possible to run init jobs without starting the entire platform - [Bugfix] Make it possible to run init jobs without starting the entire platform
- [Improvement] Reduce "openedx" Docker image size with static asset de-duplication - [Improvement] Reduce "openedx" Docker image size with static asset de-duplication

5
docs/configuration.rst
View File

@ -81,11 +81,16 @@ You may want to pull/push images from/to a custom docker registry. For instance,
Open edX customisation Open edX customisation
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/juniper.3"``)
This defines the default version that will be pulled from all Open edX git repositories.
- ``OPENEDX_CMS_GUNICORN_WORKERS`` (default: ``2``) - ``OPENEDX_CMS_GUNICORN_WORKERS`` (default: ``2``)
- ``OPENEDX_LMS_GUNICORN_WORKERS`` (default: ``2``) - ``OPENEDX_LMS_GUNICORN_WORKERS`` (default: ``2``)
By default there are 2 `gunicorn worker processes <https://docs.gunicorn.org/en/stable/settings.html#worker-processes>`__ to serve requests for the LMS and the CMS. However, each workers requires upwards of 500 Mb of RAM. You should reduce this value to 1 if your computer/server does not have enough memory. By default there are 2 `gunicorn worker processes <https://docs.gunicorn.org/en/stable/settings.html#worker-processes>`__ to serve requests for the LMS and the CMS. However, each workers requires upwards of 500 Mb of RAM. You should reduce this value to 1 if your computer/server does not have enough memory.
Vendor services Vendor services
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~

2
tutor/templates/build/forum/Dockerfile
View File

@ -30,7 +30,7 @@ RUN gem install bundler -v $BUNDLER_VERSION
RUN gem install rake -v $RAKE_VERSION RUN gem install rake -v $RAKE_VERSION
# Install forum # Install forum
RUN git clone https://github.com/edx/cs_comments_service.git --branch open-release/juniper.3 --depth 1 /openedx/cs_comments_service RUN git clone https://github.com/edx/cs_comments_service.git --branch {{ OPENEDX_COMMON_VERSION }} --depth 1 /openedx/cs_comments_service
WORKDIR /openedx/cs_comments_service WORKDIR /openedx/cs_comments_service
RUN bundle install --deployment RUN bundle install --deployment

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

@ -28,7 +28,7 @@ RUN curl -L -o /tmp/dockerize.tar.gz https://github.com/jwilder/dockerize/releas
###### Checkout edx-platform code ###### Checkout edx-platform code
FROM minimal as code FROM minimal as code
ARG EDX_PLATFORM_REPOSITORY=https://github.com/edx/edx-platform.git ARG EDX_PLATFORM_REPOSITORY=https://github.com/edx/edx-platform.git
ARG EDX_PLATFORM_VERSION=open-release/juniper.3 ARG EDX_PLATFORM_VERSION={{ OPENEDX_COMMON_VERSION }}
RUN mkdir -p /openedx/edx-platform && \ RUN mkdir -p /openedx/edx-platform && \
git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 /openedx/edx-platform git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 /openedx/edx-platform
WORKDIR /openedx/edx-platform WORKDIR /openedx/edx-platform

1
tutor/templates/config.yml
View File

@ -64,6 +64,7 @@ OPENEDX_LMS_GUNICORN_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/juniper.3"
MYSQL_HOST: "mysql" MYSQL_HOST: "mysql"
MYSQL_PORT: 3306 MYSQL_PORT: 3306
MYSQL_ROOT_USERNAME: "root" MYSQL_ROOT_USERNAME: "root"

2
tutor/templates/hooks/cms/importdemocourse
View File

@ -1,7 +1,7 @@
echo "Loading settings $DJANGO_SETTINGS_MODULE" echo "Loading settings $DJANGO_SETTINGS_MODULE"
# Import demo course # Import demo course
git clone https://github.com/edx/edx-demo-course --branch open-release/juniper.3 --depth 1 ../edx-demo-course git clone https://github.com/edx/edx-demo-course --branch {{ OPENEDX_COMMON_VERSION }} --depth 1 ../edx-demo-course
python ./manage.py cms import ../data ../edx-demo-course python ./manage.py cms import ../data ../edx-demo-course
# Re-index courses # Re-index courses