diff --git a/changelog.d/20250416_123930_nlevesq_docker_compose_prod_override.md b/changelog.d/20250416_123930_nlevesq_docker_compose_prod_override.md new file mode 100644 index 0000000000..aac84176e0 --- /dev/null +++ b/changelog.d/20250416_123930_nlevesq_docker_compose_prod_override.md @@ -0,0 +1,15 @@ + + + + + +- [Improvement] Add support for `docker-compose.prod.override.yml` when using + `tutor local` commands + diff --git a/docs/local.rst b/docs/local.rst index 06d98216db..9a78d566d3 100644 --- a/docs/local.rst +++ b/docs/local.rst @@ -218,6 +218,8 @@ You might want to customise the docker-compose services listed in ``$(tutor conf vim $(tutor config printroot)/env/local/docker-compose.override.yml -The values in this file will override the values from ``docker-compose.yml`` and ``docker-compose.prod.yml``, as explained in the `docker-compose documentation `__. +The values in this file will override the values from ``docker-compose.yml`` as explained in the `docker-compose documentation `__. + +Services defined in ``docker-compose.prod.yml`` can be overriden in a ``docker-compose.prod.override.yml`` file in that same folder. Similarly, the job service configuration can be overridden by creating a ``docker-compose.jobs.override.yml`` file in that same folder. diff --git a/tutor/commands/local.py b/tutor/commands/local.py index a9a6141524..df4f9b39de 100644 --- a/tutor/commands/local.py +++ b/tutor/commands/local.py @@ -19,6 +19,7 @@ def __init__(self, root: str, config: Config): tutor_env.pathjoin(self.root, "local", "docker-compose.yml"), tutor_env.pathjoin(self.root, "local", "docker-compose.prod.yml"), tutor_env.pathjoin(self.root, "local", "docker-compose.override.yml"), + tutor_env.pathjoin(self.root, "local", "docker-compose.prod.override.yml"), ] self.docker_compose_job_files += [ tutor_env.pathjoin(self.root, "local", "docker-compose.jobs.yml"),