christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-26 06:28:24 +00:00
Code Issues Releases Activity

Upgrade to Ironwood

Browse Source 
Here, we upgrade all images from Ironwood to Hawthorn, except for the
locales, which we did not generate yet.
This commit is contained in:
Régis Behmo 2019-01-19 15:42:39 +01:00
parent e2018c29b2
commit 7462f208de
15 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -82,6 +82,7 @@
- 2019-01-27 [Bugfix] Fix video transcript/srt upload and download of user-uploaded files. Thanks @dannielariola!
- 2019-01-20 [Improvement] Make it easy to load custom settings for the local production install
- 2019-01-19 [Improvement] Upgrade to Ironwood
- 2019-01-16 [Improvement] Switch license from MIT to AGPL
- 2019-01-04 [Bugfix] Fix xqueue consumer command
- 2018-12-26 [Improvement] Upgrade nodejs to 5.5.1

2
docs/customise.rst
View File

@ -68,7 +68,7 @@ You may want to run your own flavor of edx-platform instead of the `official ver
--build-arg EDX_PLATFORM_REPOSITORY=https://mygitrepo/edx-platform.git \
--build-arg EDX_PLATFORM_VERSION=my-tag-or-branch
Note that your release must be a fork of Hawthorn in order to work. Otherwise, you may have important compatibility issues with other services. In particular, **don't try to run Tutor with older versions of Open edX**.
Note that your release must be a fork of Ironwood in order to work. Otherwise, you may have important compatibility issues with other services. In particular, **don't try to run Tutor with older versions of Open edX**.
Running a different ``openedx`` Docker image
--------------------------------------------

4
docs/dev.rst
View File

@ -34,7 +34,7 @@ If you don't want to rewrite this option every time, you can instead define the
All development commands will then automatically mount your local repo.
**Note:** containers are built on the Hawthorn release. If you are working on a different version of Open edX, you will have to rebuild the ``openedx`` docker images with the version. See the ":ref:`fork edx-platform <edx_platform_fork>`.
**Note:** containers are built on the Ironwood release. If you are working on a different version of Open edX, you will have to rebuild the ``openedx`` docker images with the version. See the ":ref:`fork edx-platform <edx_platform_fork>`.
Prepare the edx-platform repo
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -78,7 +78,7 @@ Make changes to some of the files inside the theme directory: the theme assets s
Assets management
-----------------
Assets building and collecting is made more difficult by the fact that development settings are `incorrectly loaded in Hawthorn <https://github.com/edx/edx-platform/pull/18430/files>`_. This should be fixed in the next Open edX release. Meanwhile, do not run ``paver update_assets`` while in development mode. When working locally on a theme, build assets by running in the container::
Assets building and collecting is made more difficult by the fact that development settings are `incorrectly loaded in Ironwood <https://github.com/edx/edx-platform/pull/18430/files>`_. This should be fixed in the next Open edX release. Meanwhile, do not run ``paver update_assets`` while in development mode. When working locally on a theme, build assets by running in the container::
openedx-assets build

2
docs/troubleshooting.rst
View File

@ -78,7 +78,7 @@ This will occur if you try to run a development environment without patching the
"TypeError: get_logger_config() got an unexpected keyword argument 'debug'"
-------------------------------------------------------------------------------
This might occur when you try to run the latest version of ``edx-platform``, and not a version close to ``hawthorn.master``. It is no longer necessary to patch the ``LOGGING`` configuration in the latest ``edx-platform`` releases, as indicated in the `development_` section, so you should remove the call to ``get_logger_config`` altogether from your development settings.
This might occur when you try to run the latest version of ``edx-platform``, and not a version close to ``ironwood.1``. It is no longer necessary to patch the ``LOGGING`` configuration in the latest ``edx-platform`` releases, as indicated in the `development_` section, so you should remove the call to ``get_logger_config`` altogether from your development settings.
The chosen default language does not display properly
-----------------------------------------------------

2
tutor/templates/apps/openedx/settings/cms/development.py
View File

@ -1,8 +1,6 @@
import os
from cms.envs.devstack import *
INSTALLED_APPS.remove('openedx.core.djangoapps.datadog.apps.DatadogConfig')
# Load module store settings from config files
update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)

4
tutor/templates/apps/openedx/settings/cms/production.py
View File

@ -1,7 +1,5 @@
import os
from cms.envs.aws import *
INSTALLED_APPS.remove('openedx.core.djangoapps.datadog.apps.DatadogConfig')
from cms.envs.production import *
update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)

2
tutor/templates/apps/openedx/settings/lms/development.py
View File

@ -1,8 +1,6 @@
import os
from lms.envs.devstack import *
INSTALLED_APPS.remove('openedx.core.djangoapps.datadog.apps.DatadogConfig')
# Load module store settings from config files
update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)

4
tutor/templates/apps/openedx/settings/lms/production.py
View File

@ -1,7 +1,5 @@
import os
from lms.envs.aws import *
INSTALLED_APPS.remove('openedx.core.djangoapps.datadog.apps.DatadogConfig')
from lms.envs.production import *
# Load module store settings from config files
update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)

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

@ -23,8 +23,7 @@ RUN wget https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_
RUN yes | /openedx/android-sdk/tools/bin/sdkmanager "platforms;android-27" 1> /dev/null
# Install android app repo
# release/2.16.4 is the last know release to work with hawthorn
RUN git clone https://github.com/edx/edx-app-android --branch release/2.16.4 --depth 1 /openedx/edx-app-android
RUN git clone https://github.com/edx/edx-app-android --branch master --depth 1 /openedx/edx-app-android
WORKDIR /openedx/edx-app-android
# Install gradle and all dependencies

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

@ -24,7 +24,7 @@ RUN gem install rake -v $RAKE_VERSION
RUN gem install rubygems-update && update_rubygems
# Install forum
RUN git clone https://github.com/edx/cs_comments_service.git --branch open-release/hawthorn.2 --depth 1 /openedx/cs_comments_service
RUN git clone https://github.com/edx/cs_comments_service.git --branch open-release/ironwood.1 --depth 1 /openedx/cs_comments_service
WORKDIR /openedx/cs_comments_service
RUN bundle install --deployment

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

@ -6,7 +6,7 @@ RUN apt update && \
apt install -y language-pack-en git python-pip libmysqlclient-dev
RUN mkdir /openedx
RUN git clone https://github.com/edx/edx-notes-api --branch open-release/hawthorn.2 --depth 1 /openedx/edx-notes-api
RUN git clone https://github.com/edx/edx-notes-api --branch open-release/ironwood.1 --depth 1 /openedx/edx-notes-api
WORKDIR /openedx/edx-notes-api
RUN pip install -r requirements/base.txt

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

@ -21,12 +21,13 @@ RUN curl -L -o /tmp/dockerize.tar.gz https://github.com/jwilder/dockerize/releas
## Checkout edx-platform code
ARG EDX_PLATFORM_REPOSITORY=https://github.com/edx/edx-platform.git
ARG EDX_PLATFORM_VERSION=open-release/hawthorn.2
ARG EDX_PLATFORM_VERSION=open-release/ironwood.1
RUN mkdir -p /openedx/edx-platform && \
git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 /openedx/edx-platform
WORKDIR /openedx/edx-platform
# Download extra locales to /openedx/locale
# TODO upgrade this to ironwood
RUN cd /tmp \
&& curl -L -o openedx-i18n.tar.gz https://github.com/regisb/openedx-i18n/archive/hawthorn.tar.gz \
&& tar xzf /tmp/openedx-i18n.tar.gz \
@ -42,10 +43,6 @@ ENV VIRTUAL_ENV /openedx/venv/
RUN pip install setuptools==39.0.1 pip==9.0.3
RUN pip install -r requirements/edx/development.txt
# Install patched version of ora2
RUN pip uninstall -y ora2 && \
pip install git+https://github.com/regisb/edx-ora2.git@open-release/hawthorn.2#egg=ora2==2.1.17
# Install a recent version of nodejs
RUN nodeenv /openedx/nodeenv --node=8.9.3 --prebuilt
ENV PATH /openedx/nodeenv/bin:${PATH}

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

@ -6,7 +6,7 @@ RUN apt update && \
apt install -y language-pack-en git python-pip libmysqlclient-dev
RUN mkdir /openedx
RUN git clone https://github.com/edx/xqueue --branch open-release/hawthorn.2 --depth 1 /openedx/xqueue
RUN git clone https://github.com/edx/xqueue --branch open-release/ironwood.1 --depth 1 /openedx/xqueue
WORKDIR /openedx/xqueue
RUN pip install -r requirements.txt

10
tutor/templates/config-defaults.yml
View File

@ -8,11 +8,11 @@ ACTIVATE_SMTP: true
ANDROID_RELEASE_STORE_PASSWORD: "android store password"
ANDROID_RELEASE_KEY_PASSWORD: "android release key password"
ANDROID_RELEASE_KEY_ALIAS: "android release key alias"
DOCKER_IMAGE_OPENEDX: "regis/openedx:hawthorn"
DOCKER_IMAGE_ANDROID: "regis/openedx-android:hawthorn"
DOCKER_IMAGE_FORUM: "regis/openedx-forum:hawthorn"
DOCKER_IMAGE_NOTES: "regis/openedx-notes:hawthorn"
DOCKER_IMAGE_XQUEUE: "regis/openedx-xqueue:hawthorn"
DOCKER_IMAGE_OPENEDX: "regis/openedx:ironwood"
DOCKER_IMAGE_ANDROID: "regis/openedx-android:ironwood"
DOCKER_IMAGE_FORUM: "regis/openedx-forum:ironwood"
DOCKER_IMAGE_NOTES: "regis/openedx-notes:ironwood"
DOCKER_IMAGE_XQUEUE: "regis/openedx-xqueue:ironwood"
DOCKER_IMAGE_MEMCACHED: "memcached:1.4.38"
DOCKER_IMAGE_MONGODB: "mongo:3.2.16"
DOCKER_IMAGE_MYSQL: "mysql:5.6.36"

2
tutor/templates/scripts/import_demo_course.sh
View File

@ -1,2 +1,2 @@
git clone https://github.com/edx/edx-demo-course --branch open-release/hawthorn.2 --depth 1 ../edx-demo-course
git clone https://github.com/edx/edx-demo-course --branch open-release/ironwood.1 --depth 1 ../edx-demo-course
python ./manage.py cms --settings=tutor.production import ../data ../edx-demo-course