christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-05 23:20:40 +00:00
Code Issues Releases Activity

Upgrade from ironwood.1 to ironwood.2

Browse Source 
Because https://github.com/edx/edx-platform/pull/20325/ was merged in
ironwood.2, we no longer need this patch.
This commit is contained in:
Régis Behmo 2019-06-07 08:50:43 +02:00
parent d012a7cfaf
commit 7a3c0e2f84
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## Latest ## Latest
- [Improvement] Upgrade to ironwood.2
- [Improvement] Add `-y/--yes` option to `local quickstart` for non-interactive quickstart - [Improvement] Add `-y/--yes` option to `local quickstart` for non-interactive quickstart
- [Improvement] Persist LMS/CMS logs to disk by default (with collaboration from @silviot 💪) - [Improvement] Persist LMS/CMS logs to disk by default (with collaboration from @silviot 💪)
- [Bugfix] Fix installing a locally cloned requirement repository - [Bugfix] Fix installing a locally cloned requirement repository

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'" "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 ``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. This might occur when you try to run the latest version of ``edx-platform``, and not a version close to ``ironwood.2``. 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 The chosen default language does not display properly
----------------------------------------------------- -----------------------------------------------------

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

@ -30,7 +30,7 @@ RUN gem install rake -v $RAKE_VERSION
RUN gem install rubygems-update && update_rubygems RUN gem install rubygems-update && update_rubygems
# Install forum # Install forum
RUN git clone https://github.com/edx/cs_comments_service.git --branch open-release/ironwood.1 --depth 1 /openedx/cs_comments_service RUN git clone https://github.com/edx/cs_comments_service.git --branch open-release/ironwood.2 --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/notes/Dockerfile
View File

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

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

@ -19,15 +19,11 @@ RUN curl -L -o /tmp/dockerize.tar.gz https://github.com/jwilder/dockerize/releas
# Checkout edx-platform code # Checkout edx-platform 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/ironwood.1 ARG EDX_PLATFORM_VERSION=open-release/ironwood.2
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
# Apply patches
# https://github.com/edx/edx-platform/pull/20325/
RUN curl https://github.com/edx/edx-platform/commit/14fdc28daa00d07d9176c9dbd85b6a2d7ca3e473.patch | git apply -
# Download extra locales to /openedx/locale # Download extra locales to /openedx/locale
# TODO upgrade this to ironwood # TODO upgrade this to ironwood
RUN cd /tmp \ RUN cd /tmp \

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 apt install -y language-pack-en git python-pip libmysqlclient-dev
RUN mkdir /openedx RUN mkdir /openedx
RUN git clone https://github.com/edx/xqueue --branch open-release/ironwood.1 --depth 1 /openedx/xqueue RUN git clone https://github.com/edx/xqueue --branch open-release/ironwood.2 --depth 1 /openedx/xqueue
WORKDIR /openedx/xqueue WORKDIR /openedx/xqueue
RUN pip install -r requirements.txt RUN pip install -r requirements.txt

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/ironwood.1 --depth 1 ../edx-demo-course git clone https://github.com/edx/edx-demo-course --branch open-release/ironwood.2 --depth 1 ../edx-demo-course
python ./manage.py cms --settings=tutor.production import ../data ../edx-demo-course python ./manage.py cms --settings=tutor.production import ../data ../edx-demo-course