From c2d536dae5102e5ace24d0d8432ba8b5165c46ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Tue, 2 Oct 2018 08:36:29 +0200 Subject: [PATCH] Upgrade to hawthorn.2 --- CHANGELOG.md | 1 + forum/Dockerfile | 2 +- notes/Dockerfile | 2 +- openedx/Dockerfile | 2 +- xqueue/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dc8e4a..ec147b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog +- 2018-10-02 [Improvement] Bump Open edX version to hawthorn.2 - 2018-09-30 [Bugfix] Fix CMS celery worker, including export tasks - 2018-09-30 [Improvement] Simplify boolean feature flags definition - 2018-09-29 [Improvement] Add logging commands diff --git a/forum/Dockerfile b/forum/Dockerfile index 9a10017..5ebf666 100644 --- a/forum/Dockerfile +++ b/forum/Dockerfile @@ -23,7 +23,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.1 --depth 1 /openedx/cs_comments_service +RUN git clone https://github.com/edx/cs_comments_service.git --branch open-release/hawthorn.2 --depth 1 /openedx/cs_comments_service WORKDIR /openedx/cs_comments_service RUN bundle install --deployment diff --git a/notes/Dockerfile b/notes/Dockerfile index 63eb5bd..57ba9db 100644 --- a/notes/Dockerfile +++ b/notes/Dockerfile @@ -5,7 +5,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.1 --depth 1 /openedx/edx-notes-api +RUN git clone https://github.com/edx/edx-notes-api --branch open-release/hawthorn.2 --depth 1 /openedx/edx-notes-api WORKDIR /openedx/edx-notes-api RUN pip install -r requirements/base.txt diff --git a/openedx/Dockerfile b/openedx/Dockerfile index 448222a..b158c07 100644 --- a/openedx/Dockerfile +++ b/openedx/Dockerfile @@ -23,7 +23,7 @@ WORKDIR /openedx/edx-platform ## Checkout edx-platform code ARG EDX_PLATFORM_REPOSITORY=https://github.com/edx/edx-platform.git -ARG EDX_PLATFORM_VERSION=open-release/hawthorn.1 +ARG EDX_PLATFORM_VERSION=open-release/hawthorn.2 RUN git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 . # Install python requirements (clone source repos in a separate dir, otherwise diff --git a/xqueue/Dockerfile b/xqueue/Dockerfile index b766618..c3f5361 100644 --- a/xqueue/Dockerfile +++ b/xqueue/Dockerfile @@ -5,7 +5,7 @@ RUN apt update && \ apt install -y language-pack-en git git-core python-pip libmysqlclient-dev RUN mkdir /openedx -RUN git clone https://github.com/edx/xqueue --branch open-release/hawthorn.1 --depth 1 /openedx/xqueue +RUN git clone https://github.com/edx/xqueue --branch open-release/hawthorn.2 --depth 1 /openedx/xqueue WORKDIR /openedx/xqueue RUN pip install -r requirements.txt