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

Fix triple course display in LMS search dashboard

Browse Source 
Apply upstream patch from https://github.com/edx/edx-platform/pull/20325/

Close #189.
This commit is contained in:
Régis Behmo 2019-04-29 19:41:05 +02:00
parent 34789273e6
commit 25d1d38f85
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## Latest
- [Bugfix] Fix triple display of courses in LMS search (upstream patch, #189)
## 3.3.8 (2019-04-28) ## 3.3.8 (2019-04-28)
- [Bugfix] Reduce the number of gunicorn workers to address RAM usage (#207) - [Bugfix] Reduce the number of gunicorn workers to address RAM usage (#207)

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

@ -19,13 +19,17 @@ RUN curl -L -o /tmp/dockerize.tar.gz https://github.com/jwilder/dockerize/releas
&& tar -C /usr/local/bin -xzvf /tmp/dockerize.tar.gz \ && tar -C /usr/local/bin -xzvf /tmp/dockerize.tar.gz \
&& rm /tmp/dockerize.tar.gz && rm /tmp/dockerize.tar.gz
## 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.1
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 \