mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-12-12 14:17:46 +00:00
Merge branch 'master' into nightly
This commit is contained in:
commit
2e3e7703d3
@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥".
|
||||
|
||||
## Unreleased
|
||||
|
||||
- [Fix] "The Compose file is invalid" error on mounting dev-only folders.
|
||||
- [Fix] CMS settings in development.
|
||||
|
||||
## v13.2.0 (2022-04-24)
|
||||
|
@ -19,6 +19,7 @@ class ComposeJobRunner(jobs.BaseComposeJobRunner):
|
||||
self.project_name = ""
|
||||
self.docker_compose_files: t.List[str] = []
|
||||
self.docker_compose_job_files: t.List[str] = []
|
||||
self.docker_compose_tmp_path = ""
|
||||
|
||||
def docker_compose(self, *command: str) -> int:
|
||||
"""
|
||||
|
@ -18,10 +18,13 @@ class DevJobRunner(compose.ComposeJobRunner):
|
||||
"""
|
||||
super().__init__(root, config)
|
||||
self.project_name = get_typed(self.config, "DEV_PROJECT_NAME", str)
|
||||
self.docker_compose_tmp_path = tutor_env.pathjoin(
|
||||
self.root, "dev", "docker-compose.tmp.yml"
|
||||
)
|
||||
self.docker_compose_files += [
|
||||
tutor_env.pathjoin(self.root, "local", "docker-compose.yml"),
|
||||
tutor_env.pathjoin(self.root, "dev", "docker-compose.yml"),
|
||||
tutor_env.pathjoin(self.root, "local", "docker-compose.tmp.yml"),
|
||||
self.docker_compose_tmp_path,
|
||||
tutor_env.pathjoin(self.root, "local", "docker-compose.override.yml"),
|
||||
tutor_env.pathjoin(self.root, "dev", "docker-compose.override.yml"),
|
||||
]
|
||||
|
@ -20,10 +20,13 @@ class LocalJobRunner(compose.ComposeJobRunner):
|
||||
"""
|
||||
super().__init__(root, config)
|
||||
self.project_name = get_typed(self.config, "LOCAL_PROJECT_NAME", str)
|
||||
self.docker_compose_tmp_path = tutor_env.pathjoin(
|
||||
self.root, "dev", "docker-compose.tmp.yml"
|
||||
)
|
||||
self.docker_compose_files += [
|
||||
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.tmp.yml"),
|
||||
self.docker_compose_tmp_path,
|
||||
tutor_env.pathjoin(self.root, "local", "docker-compose.override.yml"),
|
||||
]
|
||||
self.docker_compose_job_files += [
|
||||
|
Loading…
Reference in New Issue
Block a user