6
0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-10 09:02:14 +00:00

chore: remove obsolete version property in Compose (#1070)

Close https://github.com/overhangio/tutor/issues/1066
This commit is contained in:
Jason Mok 2024-05-28 10:12:30 -05:00 committed by GitHub
parent d682b74053
commit fa5201b848
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 1 additions and 13 deletions

View File

@ -0,0 +1 @@
- [Improvement] Remove the obsolete `version` property from all Docker Compose files and remove the DOCKER_COMPOSE_VERSION config setting. This addresses the deprecation warning from docker-compose (version 1.27 and above) regarding `version` being obsolete. (by @jasonmokk)

View File

@ -117,10 +117,6 @@ You may want to pull/push images from/to a custom docker registry. For instance,
Compose Compose
******* *******
- ``DOCKER_COMPOSE_VERSION`` (default: ``"3.7"``)
This configuration parameter sets the version of Docker Compose to be used to build all containers.
- ``DEV_PROJECT_NAME`` (default: ``"{{ TUTOR_APP }}_dev"``) - ``DEV_PROJECT_NAME`` (default: ``"{{ TUTOR_APP }}_dev"``)
This configuration parameter sets the Development version of the Docker Compose project name. This configuration parameter sets the Development version of the Docker Compose project name.

View File

@ -238,7 +238,6 @@ Adding items to the ``MOUNTS`` setting effectively adds new bind-mount volumes t
You are then free to bind-mount any directory to any container. For instance, to mount your own edx-platform fork:: You are then free to bind-mount any directory to any container. For instance, to mount your own edx-platform fork::
version: "3.7"
services: services:
lms: lms:
volumes: volumes:

View File

@ -8,7 +8,6 @@ CMS_OAUTH2_KEY_SSO: "cms-sso"
CMS_OAUTH2_KEY_SSO_DEV: "cms-sso-dev" CMS_OAUTH2_KEY_SSO_DEV: "cms-sso-dev"
CONTACT_EMAIL: "contact@{{ LMS_HOST }}" CONTACT_EMAIL: "contact@{{ LMS_HOST }}"
DEV_PROJECT_NAME: "{{ TUTOR_APP }}_dev" DEV_PROJECT_NAME: "{{ TUTOR_APP }}_dev"
DOCKER_COMPOSE_VERSION: "3.7"
DOCKER_REGISTRY: "docker.io/" DOCKER_REGISTRY: "docker.io/"
DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}" DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}"
DOCKER_IMAGE_OPENEDX_DEV: "openedx-dev:{{ TUTOR_VERSION }}" DOCKER_IMAGE_OPENEDX_DEV: "openedx-dev:{{ TUTOR_VERSION }}"

View File

@ -1,5 +1,3 @@
version: "{{ DOCKER_COMPOSE_VERSION }}"
x-openedx-job-service: x-openedx-job-service:
&openedx-job-service &openedx-job-service
image: {{ DOCKER_IMAGE_OPENEDX_DEV }} image: {{ DOCKER_IMAGE_OPENEDX_DEV }}

View File

@ -1,5 +1,3 @@
version: "{{ DOCKER_COMPOSE_VERSION }}"
x-openedx-service: x-openedx-service:
&openedx-service &openedx-service
image: {{ DOCKER_IMAGE_OPENEDX_DEV }} image: {{ DOCKER_IMAGE_OPENEDX_DEV }}

View File

@ -11,7 +11,6 @@
# This is because jobs are often used for initialization tasks, which may need to # This is because jobs are often used for initialization tasks, which may need to
# happen before the service can be successfully `start`ed. # happen before the service can be successfully `start`ed.
version: "{{ DOCKER_COMPOSE_VERSION }}"
services: services:
mysql-job: mysql-job:

View File

@ -1,4 +1,3 @@
version: "{{ DOCKER_COMPOSE_VERSION }}"
services: services:
# Web proxy for load balancing and SSL termination # Web proxy for load balancing and SSL termination
caddy: caddy:

View File

@ -1,4 +1,3 @@
version: "{{ DOCKER_COMPOSE_VERSION }}"
services: services:
# Set bind-mounted folder ownership # Set bind-mounted folder ownership