diff --git a/tutor/__about__.py b/tutor/__about__.py index 2da2ef6..e3eecf3 100644 --- a/tutor/__about__.py +++ b/tutor/__about__.py @@ -10,7 +10,7 @@ __version__ = "12.1.4" # the nightly branch. # The suffix is cleanly separated from the __version__ in this module to avoid # 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 # plugin directory. To avoid conflicts between multiple locally-installed diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 881ac46..b314e7c 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 #} @@ -75,7 +73,7 @@ COPY --from=code /openedx/edx-platform /openedx/edx-platform WORKDIR /openedx/edx-platform # 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 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" # 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 RUN pip install uwsgi==2.0.19.1 diff --git a/tutor/templates/config.yml b/tutor/templates/config.yml index e46af60..4b2bc1c 100644 --- a/tutor/templates/config.yml +++ b/tutor/templates/config.yml @@ -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_FORUM: "{{ DOCKER_REGISTRY }}overhangio/openedx-forum:{{ TUTOR_VERSION }}" 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_NGINX: "{{ DOCKER_REGISTRY }}nginx:1.19.9" -DOCKER_IMAGE_REDIS: "{{ DOCKER_REGISTRY }}redis:6.2.1" +DOCKER_IMAGE_NGINX: "{{ DOCKER_REGISTRY }}nginx:1.21.1" +DOCKER_IMAGE_REDIS: "{{ DOCKER_REGISTRY }}redis:6.2.5" DOCKER_IMAGE_SMTP: "{{ DOCKER_REGISTRY }}namshi/smtp:latest" LOCAL_PROJECT_NAME: "{{ TUTOR_APP }}_local" ELASTICSEARCH_HOST: "elasticsearch" @@ -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: "master" MYSQL_HOST: "mysql" MYSQL_PORT: 3306 MYSQL_ROOT_USERNAME: "root"