mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-05-28 20:00:49 +00:00
hawthorn.1 release
From a deployment perspective, this release comes with an upgrade of the cs_comments_service (forums) and a change to the logging configuration.
This commit is contained in:
Régis Behmo
parent
aece509b31
commit
ac7fe77280
18
Makefile
18
Makefile
|
|
@ -39,8 +39,8 @@ migrate-xqueue:
|
|||
migrate: provision migrate-openedx migrate-forum migrate-xqueue
|
||||
|
||||
assets:
|
||||
$(DOCKER_COMPOSE_RUN_OPENEDX) lms paver update_assets lms --settings=$(EDX_PLATFORM_SETTINGS)
|
||||
$(DOCKER_COMPOSE_RUN_OPENEDX) cms paver update_assets cms --settings=$(EDX_PLATFORM_SETTINGS)
|
||||
$(DOCKER_COMPOSE_RUN_OPENEDX) -e NO_PREREQ_INSTALL=True lms paver update_assets lms --settings=$(EDX_PLATFORM_SETTINGS)
|
||||
$(DOCKER_COMPOSE_RUN_OPENEDX) -e NO_PREREQ_INSTALL=True cms paver update_assets cms --settings=$(EDX_PLATFORM_SETTINGS)
|
||||
|
||||
##################### Running
|
||||
|
||||
|
|
@ -69,7 +69,7 @@ info:
|
|||
echo $$EDX_PLATFORM_SETTINGS
|
||||
|
||||
import-demo-course:
|
||||
$(DOCKER_COMPOSE_RUN_OPENEDX) cms /bin/bash -c "git clone https://github.com/edx/edx-demo-course ../edx-demo-course && git -C ../edx-demo-course checkout open-release/ginkgo.master && python ./manage.py cms import ../data ../edx-demo-course"
|
||||
$(DOCKER_COMPOSE_RUN_OPENEDX) cms /bin/bash -c "git clone https://github.com/edx/edx-demo-course ../edx-demo-course && git -C ../edx-demo-course checkout open-release/hawthorn.beta1 && python ./manage.py cms import ../data ../edx-demo-course"
|
||||
|
||||
create-staff-user:
|
||||
$(DOCKER_COMPOSE_RUN_OPENEDX) lms /bin/bash -c "./manage.py lms manage_user --superuser --staff ${USERNAME} ${EMAIL} && ./manage.py lms changepassword ${USERNAME}"
|
||||
|
|
@ -109,16 +109,16 @@ android-dockerhub: android-build android-push
|
|||
|
||||
build:
|
||||
# We need to build with docker, as long as docker-compose cannot push to dockerhub
|
||||
docker build -t regis/openedx:latest -t regis/openedx:ginkgo openedx/
|
||||
docker build -t regis/openedx-forum:latest -t regis/openedx-forum:ginkgo forum/
|
||||
docker build -t regis/openedx-xqueue:latest -t regis/openedx-xqueue:ginkgo xqueue/
|
||||
docker build -t regis/openedx:latest -t regis/openedx:hawthorn openedx/
|
||||
docker build -t regis/openedx-forum:latest -t regis/openedx-forum:hawthorn forum/
|
||||
docker build -t regis/openedx-xqueue:latest -t regis/openedx-xqueue:hawthorn xqueue/
|
||||
|
||||
push:
|
||||
docker push regis/openedx:ginkgo
|
||||
docker push regis/openedx:hawthorn
|
||||
docker push regis/openedx:latest
|
||||
docker push regis/openedx-forum:ginkgo
|
||||
docker push regis/openedx-forum:hawthorn
|
||||
docker push regis/openedx-forum:latest
|
||||
docker push regis/openedx-xqueue:ginkgo
|
||||
docker push regis/openedx-xqueue:hawthorn
|
||||
docker push regis/openedx-xqueue:latest
|
||||
|
||||
dockerhub: build push
|
||||
|
|
|
|||
|
|
@ -6,13 +6,9 @@ update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
|
|||
# Set uploaded media file path
|
||||
MEDIA_ROOT = "/openedx/data/uploads/"
|
||||
|
||||
# Activate dev_env for logging, otherwise rsyslog is required (but it is
|
||||
# not available in docker).
|
||||
LOGGING = get_logger_config(LOG_DIR,
|
||||
logging_env=ENV_TOKENS['LOGGING_ENV'],
|
||||
debug=False,
|
||||
dev_env=True,
|
||||
service_variant=SERVICE_VARIANT)
|
||||
# Change syslog-based loggers which don't work inside docker containers
|
||||
LOGGING['handlers']['local'] = LOGGING['handlers']['console'].copy()
|
||||
LOGGING['handlers']['tracking'] = LOGGING['handlers']['console'].copy()
|
||||
|
||||
# Create folders if necessary
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -5,13 +5,9 @@ update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
|
|||
|
||||
MEDIA_ROOT = "/openedx/data/uploads/"
|
||||
|
||||
# We need to activate dev_env for logging, otherwise rsyslog is required (but
|
||||
# it is not available in docker).
|
||||
LOGGING = get_logger_config(LOG_DIR,
|
||||
logging_env=ENV_TOKENS['LOGGING_ENV'],
|
||||
debug=False,
|
||||
dev_env=True,
|
||||
service_variant=SERVICE_VARIANT)
|
||||
# Change syslog-based loggers which don't work inside docker containers
|
||||
LOGGING['handlers']['local'] = LOGGING['handlers']['console'].copy()
|
||||
LOGGING['handlers']['tracking'] = LOGGING['handlers']['console'].copy()
|
||||
|
||||
# Create folders if necessary
|
||||
for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]:
|
||||
|
|
|
|||
|
|
@ -6,13 +6,9 @@ update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
|
|||
# Set uploaded media file path
|
||||
MEDIA_ROOT = "/openedx/data/uploads/"
|
||||
|
||||
# Activate dev_env for logging, otherwise rsyslog is required (but it is
|
||||
# not available in docker).
|
||||
LOGGING = get_logger_config(LOG_DIR,
|
||||
logging_env=ENV_TOKENS['LOGGING_ENV'],
|
||||
debug=False,
|
||||
dev_env=True,
|
||||
service_variant=SERVICE_VARIANT)
|
||||
# Change syslog-based loggers which don't work inside docker containers
|
||||
LOGGING['handlers']['local'] = LOGGING['handlers']['console'].copy()
|
||||
LOGGING['handlers']['tracking'] = LOGGING['handlers']['console'].copy()
|
||||
|
||||
# Create folders if necessary
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -5,13 +5,9 @@ update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
|
|||
|
||||
MEDIA_ROOT = "/openedx/data/uploads/"
|
||||
|
||||
# We need to activate dev_env for logging, otherwise rsyslog is required (but
|
||||
# it is not available in docker).
|
||||
LOGGING = get_logger_config(LOG_DIR,
|
||||
logging_env=ENV_TOKENS['LOGGING_ENV'],
|
||||
debug=False,
|
||||
dev_env=True,
|
||||
service_variant=SERVICE_VARIANT)
|
||||
# Change syslog-based loggers which don't work inside docker containers
|
||||
LOGGING['handlers']['local'] = LOGGING['handlers']['console'].copy()
|
||||
LOGGING['handlers']['tracking'] = LOGGING['handlers']['console'].copy()
|
||||
|
||||
# Create folders if necessary
|
||||
for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]:
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ services:
|
|||
############# Forum
|
||||
|
||||
forum:
|
||||
image: regis/openedx-forum:ginkgo
|
||||
image: regis/openedx-forum:hawthorn
|
||||
build:
|
||||
context: ./forum
|
||||
environment:
|
||||
|
|
@ -75,7 +75,7 @@ services:
|
|||
############# LMS and CMS
|
||||
|
||||
lms:
|
||||
image: regis/openedx:ginkgo
|
||||
image: regis/openedx:hawthorn
|
||||
build:
|
||||
context: ./openedx
|
||||
environment:
|
||||
|
|
@ -94,7 +94,7 @@ services:
|
|||
- smtp
|
||||
|
||||
cms:
|
||||
image: regis/openedx:ginkgo
|
||||
image: regis/openedx:hawthorn
|
||||
build:
|
||||
context: ./openedx
|
||||
environment:
|
||||
|
|
@ -114,7 +114,7 @@ services:
|
|||
|
||||
# We could probably create one service per queue here. For small instances, it is not necessary.
|
||||
lms_worker:
|
||||
image: regis/openedx:ginkgo
|
||||
image: regis/openedx:hawthorn
|
||||
build:
|
||||
context: ./openedx
|
||||
environment:
|
||||
|
|
@ -130,7 +130,7 @@ services:
|
|||
- lms
|
||||
|
||||
cms_worker:
|
||||
image: regis/openedx:ginkgo
|
||||
image: regis/openedx:hawthorn
|
||||
build:
|
||||
context: ./openedx
|
||||
environment:
|
||||
|
|
@ -147,7 +147,7 @@ services:
|
|||
|
||||
############# Xqueue: external grading of Open edX problems
|
||||
xqueue:
|
||||
image: regis/openedx-xqueue:ginkgo
|
||||
image: regis/openedx-xqueue:hawthorn
|
||||
build:
|
||||
context: ./xqueue
|
||||
volumes:
|
||||
|
|
@ -158,7 +158,7 @@ services:
|
|||
- mysql
|
||||
|
||||
xqueue_consumer:
|
||||
image: regis/openedx-xqueue:ginkgo
|
||||
image: regis/openedx-xqueue:hawthorn
|
||||
build:
|
||||
context: ./xqueue
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ WORKDIR /openedx/ruby-build
|
|||
RUN PREFIX=/usr/local ./install.sh
|
||||
|
||||
# Install ruby and some specific dependencies
|
||||
ENV RUBY_VERSION 1.9.3-p551
|
||||
ENV RUBY_VERSION 2.4.1
|
||||
ENV BUNDLER_VERSION 1.11.2
|
||||
ENV RAKE_VERSION 10.4.2
|
||||
RUN ruby-build $RUBY_VERSION /openedx/ruby
|
||||
|
|
@ -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/ginkgo.master --depth 1 /openedx/cs_comments_service
|
||||
RUN git clone https://github.com/edx/cs_comments_service.git --branch open-release/hawthorn.1 --depth 1 /openedx/cs_comments_service
|
||||
WORKDIR /openedx/cs_comments_service
|
||||
RUN bundle install --deployment
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ RUN apt update && \
|
|||
# Global requirements
|
||||
apt install -y language-pack-en git python-virtualenv build-essential software-properties-common curl git-core libxml2-dev libxslt1-dev python-pip libmysqlclient-dev python-apt python-dev libxmlsec1-dev libfreetype6-dev swig gcc g++ && \
|
||||
# openedx requirements
|
||||
apt install -y gettext gfortran graphviz graphviz-dev libffi-dev libfreetype6-dev libgeos-dev libjpeg8-dev liblapack-dev libpng12-dev libxml2-dev libxmlsec1-dev libxslt1-dev nodejs npm ntp pkg-config && \
|
||||
apt install -y gettext gfortran graphviz graphviz-dev libffi-dev libfreetype6-dev libgeos-dev libjpeg8-dev liblapack-dev libpng12-dev libsqlite3-dev libxml2-dev libxmlsec1-dev libxslt1-dev nodejs npm ntp pkg-config && \
|
||||
# Our requirements
|
||||
apt install -y mysql-client
|
||||
|
||||
|
|
@ -23,20 +23,16 @@ 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/ginkgo.master
|
||||
ARG EDX_PLATFORM_VERSION=open-release/hawthorn.1
|
||||
RUN git clone $EDX_PLATFORM_REPOSITORY --branch $EDX_PLATFORM_VERSION --depth 1 .
|
||||
|
||||
# Install python requirements (clone source repos in a separate dir, otherwise
|
||||
# will be overwritten when we mount edx-platform)
|
||||
RUN pip install --src ../venv/src -r requirements/edx/pre.txt
|
||||
RUN pip install --src ../venv/src -r requirements/edx/github.txt
|
||||
RUN pip install --src ../venv/src -r requirements/edx/local.txt
|
||||
RUN pip install --src ../venv/src -r requirements/edx/base.txt
|
||||
RUN pip install --src ../venv/src -r requirements/edx/post.txt
|
||||
RUN pip install --src ../venv/src -r requirements/edx/paver.txt
|
||||
|
||||
# Install nodejs requirements
|
||||
RUN npm install
|
||||
ENV PATH ./node_modules/.bin:${PATH}
|
||||
|
||||
# Link configuration files to common /openedx/config folder, which should later
|
||||
# be mounted as a volume. Note that this image will not be functional until
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user