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

Upgrade to v3.7 for docker-compose service definition

Browse Source 
We were encountering issues when overriding service definitions with
"x-...". These were solved by upgrading docker-compose and switching to
3.7 service definition. As a consequence, the minimum supported docker
version is 18.06.0, as specified by
https://docs.docker.com/compose/compose-file/#compose-and-docker-compatibility-matrix
This commit is contained in:
Régis Behmo 2020-01-10 10:55:08 +01:00
parent 3540627691
commit 899e4dfb9a
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,8 +4,9 @@ Note: Breaking changes between versions are indicated by "💥".
## Unreleased ## Unreleased
- [Improvement] Upgrade to the 3.7 docker-compose syntax
- [Improvement] The `dev runserver` command can now be run for just any service - [Improvement] The `dev runserver` command can now be run for just any service
- 💥[Feature] `dev run/exec` commands now support generic options which are passed to docker-compose. Consequently, defining the `TUTOR_EDX_PLATFORM_PATH` environment variable no longer works. Instead, users are encouraged to explicitely pass the `-v` option or define a command alias. - 💥[Feature] `dev run/exec` commands now support generic options which are passed to docker-compose. Consequently, defining the `TUTOR_EDX_PLATFORM_PATH` environment variable no longer works. Instead, users are encouraged to explicitely pass the `-v` option or define a command alias
## 3.9.1 (2020-01-08) ## 3.9.1 (2020-01-08)

2
docs/install.rst
View File

@ -8,7 +8,7 @@ Requirements
The only prerequisite for running this is a working docker installation. Both docker and docker-compose are required. Follow the instructions from the official documentation: The only prerequisite for running this is a working docker installation. Both docker and docker-compose are required. Follow the instructions from the official documentation:
- `Docker <https://docs.docker.com/engine/installation/>`_ - `Docker <https://docs.docker.com/engine/installation/>`_: minimum supported version is 18.06.0.
- `Docker compose <https://docs.docker.com/compose/install/>`_ - `Docker compose <https://docs.docker.com/compose/install/>`_
⚠️ Warning: do not attempt to simply run ``apt-get install docker docker-compose`` on older Ubuntu platforms, such as 16.04 (Xenial), as you will get older versions of these utilities. ⚠️ Warning: do not attempt to simply run ``apt-get install docker docker-compose`` on older Ubuntu platforms, such as 16.04 (Xenial), as you will get older versions of these utilities.

6
tutor/templates/dev/docker-compose.yml
View File

@ -1,7 +1,6 @@
version: "3" version: "3.7"
services: x-openedx-service:
x-openedx-service:
&openedx-service &openedx-service
image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_OPENEDX_DEV }} image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_OPENEDX_DEV }}
environment: environment:
@ -12,6 +11,7 @@ services:
# editable requirements # editable requirements
- ../build/openedx/requirements:/openedx/requirements - ../build/openedx/requirements:/openedx/requirements
services:
lms: lms:
<<: *openedx-service <<: *openedx-service
command: ./manage.py lms runserver 0.0.0.0:8000 command: ./manage.py lms runserver 0.0.0.0:8000

2
tutor/templates/local/docker-compose.yml
View File

@ -1,4 +1,4 @@
version: "3" version: "3.7"
services: services:
############# External services ############# External services