mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-09-27 19:59:02 +00:00
16e6131f96
We introduce a new filter to implement custom commands in arbitrary containers. It becomes easy to write convenient ad-hoc commands that users will then be able to run either on Kubernetes or locally using a documented CLI. Pluggable jobs are declared as Click commands and are responsible for parsing their own arguments. See the new CLI_DO_COMMANDS filter. Close https://github.com/overhangio/2u-tutor-adoption/issues/75
487 lines
16 KiB
Python
487 lines
16 KiB
Python
import os
|
|
import re
|
|
import typing as t
|
|
from copy import deepcopy
|
|
|
|
import click
|
|
|
|
from tutor import config as tutor_config
|
|
from tutor import env as tutor_env
|
|
from tutor import fmt, hooks, serialize, utils
|
|
from tutor.commands import jobs
|
|
from tutor.commands.context import BaseTaskContext
|
|
from tutor.exceptions import TutorError
|
|
from tutor.tasks import BaseComposeTaskRunner
|
|
from tutor.types import Config
|
|
|
|
|
|
class ComposeTaskRunner(BaseComposeTaskRunner):
|
|
def __init__(self, root: str, config: Config):
|
|
super().__init__(root, config)
|
|
self.project_name = ""
|
|
self.docker_compose_files: t.List[str] = []
|
|
self.docker_compose_job_files: t.List[str] = []
|
|
|
|
def docker_compose(self, *command: str) -> int:
|
|
"""
|
|
Run docker-compose with the right yml files.
|
|
"""
|
|
if "start" in command or "up" in command or "restart" in command:
|
|
# Note that we don't trigger the action on "run". That's because we
|
|
# don't want to trigger the action for every initialization script.
|
|
hooks.Actions.COMPOSE_PROJECT_STARTED.do(
|
|
self.root, self.config, self.project_name
|
|
)
|
|
args = []
|
|
for docker_compose_path in self.docker_compose_files:
|
|
if os.path.exists(docker_compose_path):
|
|
args += ["-f", docker_compose_path]
|
|
return utils.docker_compose(
|
|
*args, "--project-name", self.project_name, *command
|
|
)
|
|
|
|
def update_docker_compose_tmp(
|
|
self,
|
|
compose_tmp_filter: hooks.filters.Filter,
|
|
compose_jobs_tmp_filter: hooks.filters.Filter,
|
|
docker_compose_tmp_path: str,
|
|
docker_compose_jobs_tmp_path: str,
|
|
) -> None:
|
|
"""
|
|
Update the contents of the docker-compose.tmp.yml and
|
|
docker-compose.jobs.tmp.yml files, which are generated at runtime.
|
|
"""
|
|
compose_base = {
|
|
"version": "{{ DOCKER_COMPOSE_VERSION }}",
|
|
"services": {},
|
|
}
|
|
|
|
# 1. Apply compose_tmp filter
|
|
# 2. Render the resulting dict
|
|
# 3. Serialize to yaml
|
|
# 4. Save to disk
|
|
docker_compose_tmp: str = serialize.dumps(
|
|
tutor_env.render_unknown(
|
|
self.config, compose_tmp_filter.apply(deepcopy(compose_base))
|
|
)
|
|
)
|
|
tutor_env.write_to(
|
|
docker_compose_tmp,
|
|
docker_compose_tmp_path,
|
|
)
|
|
|
|
# Same thing but with tmp jobs
|
|
docker_compose_jobs_tmp: str = serialize.dumps(
|
|
tutor_env.render_unknown(
|
|
self.config, compose_jobs_tmp_filter.apply(deepcopy(compose_base))
|
|
)
|
|
)
|
|
tutor_env.write_to(
|
|
docker_compose_jobs_tmp,
|
|
docker_compose_jobs_tmp_path,
|
|
)
|
|
|
|
def run_task(self, service: str, command: str) -> int:
|
|
"""
|
|
Run the "{{ service }}-job" service from local/docker-compose.jobs.yml with the
|
|
specified command.
|
|
"""
|
|
run_command = []
|
|
for docker_compose_path in self.docker_compose_job_files:
|
|
path = tutor_env.pathjoin(self.root, docker_compose_path)
|
|
if os.path.exists(path):
|
|
run_command += ["-f", path]
|
|
run_command += ["run", "--rm"]
|
|
if not utils.is_a_tty():
|
|
run_command += ["-T"]
|
|
job_service_name = f"{service}-job"
|
|
return self.docker_compose(
|
|
*run_command,
|
|
job_service_name,
|
|
"sh",
|
|
"-e",
|
|
"-c",
|
|
command,
|
|
)
|
|
|
|
|
|
class BaseComposeContext(BaseTaskContext):
|
|
COMPOSE_TMP_FILTER: hooks.filters.Filter = NotImplemented
|
|
COMPOSE_JOBS_TMP_FILTER: hooks.filters.Filter = NotImplemented
|
|
|
|
def job_runner(self, config: Config) -> ComposeTaskRunner:
|
|
raise NotImplementedError
|
|
|
|
|
|
class MountParam(click.ParamType):
|
|
"""
|
|
Parser for --mount arguments of the form "service1[,service2,...]:/host/path:/container/path".
|
|
"""
|
|
|
|
name = "mount"
|
|
MountType = t.Tuple[str, str, str]
|
|
# Note that this syntax does not allow us to include colon ':' characters in paths
|
|
PARAM_REGEXP = (
|
|
r"(?P<services>[a-zA-Z0-9-_, ]+):(?P<host_path>[^:]+):(?P<container_path>[^:]+)"
|
|
)
|
|
|
|
def convert(
|
|
self,
|
|
value: str,
|
|
param: t.Optional["click.Parameter"],
|
|
ctx: t.Optional[click.Context],
|
|
) -> t.List["MountType"]:
|
|
mounts = self.convert_explicit_form(value) or self.convert_implicit_form(value)
|
|
return mounts
|
|
|
|
def convert_explicit_form(self, value: str) -> t.List["MountParam.MountType"]:
|
|
"""
|
|
Argument is of the form "containers:/host/path:/container/path".
|
|
"""
|
|
match = re.match(self.PARAM_REGEXP, value)
|
|
if not match:
|
|
return []
|
|
|
|
mounts: t.List["MountParam.MountType"] = []
|
|
services: t.List[str] = [
|
|
service.strip() for service in match["services"].split(",")
|
|
]
|
|
host_path = os.path.abspath(os.path.expanduser(match["host_path"]))
|
|
host_path = host_path.replace(os.path.sep, "/")
|
|
container_path = match["container_path"]
|
|
for service in services:
|
|
if not service:
|
|
self.fail(f"incorrect services syntax: '{match['services']}'")
|
|
mounts.append((service, host_path, container_path))
|
|
return mounts
|
|
|
|
def convert_implicit_form(self, value: str) -> t.List["MountParam.MountType"]:
|
|
"""
|
|
Argument is of the form "/host/path"
|
|
"""
|
|
mounts: t.List["MountParam.MountType"] = []
|
|
host_path = os.path.abspath(os.path.expanduser(value))
|
|
volumes: t.Iterator[t.Tuple[str, str]] = hooks.Filters.COMPOSE_MOUNTS.iterate(
|
|
os.path.basename(host_path)
|
|
)
|
|
for service, container_path in volumes:
|
|
mounts.append((service, host_path, container_path))
|
|
if not mounts:
|
|
raise self.fail(f"no mount found for {value}")
|
|
return mounts
|
|
|
|
|
|
mount_option = click.option(
|
|
"-m",
|
|
"--mount",
|
|
"mounts",
|
|
help="""Bind-mount a folder from the host in the right containers. This option can take two different forms. The first one is explicit: 'service1[,service2...]:/host/path:/container/path'. The other is implicit: '/host/path'. Arguments passed in the implicit form will be parsed by plugins to define the right folders to bind-mount from the host.""",
|
|
type=MountParam(),
|
|
multiple=True,
|
|
)
|
|
|
|
|
|
def mount_tmp_volumes(
|
|
all_mounts: t.Tuple[t.List[MountParam.MountType], ...],
|
|
context: BaseComposeContext,
|
|
) -> None:
|
|
for mounts in all_mounts:
|
|
for service, host_path, container_path in mounts:
|
|
mount_tmp_volume(service, host_path, container_path, context)
|
|
|
|
|
|
def mount_tmp_volume(
|
|
service: str,
|
|
host_path: str,
|
|
container_path: str,
|
|
context: BaseComposeContext,
|
|
) -> None:
|
|
"""
|
|
Append user-defined bind-mounted volumes to the docker-compose.tmp file(s).
|
|
|
|
The service/host path/container path values are appended to the docker-compose
|
|
files by mean of two filters. Each dev/local environment is then responsible for
|
|
generating the files based on the output of these filters.
|
|
|
|
Bind-mounts that are associated to "*-job" services will be added to the
|
|
docker-compose jobs file.
|
|
"""
|
|
fmt.echo_info(f"Bind-mount: {host_path} -> {container_path} in {service}")
|
|
compose_tmp_filter: hooks.filters.Filter = (
|
|
context.COMPOSE_JOBS_TMP_FILTER
|
|
if service.endswith("-job")
|
|
else context.COMPOSE_TMP_FILTER
|
|
)
|
|
|
|
@compose_tmp_filter.add()
|
|
def _add_mounts_to_docker_compose_tmp(
|
|
docker_compose: t.Dict[str, t.Any],
|
|
) -> t.Dict[str, t.Any]:
|
|
services = docker_compose.setdefault("services", {})
|
|
services.setdefault(service, {"volumes": []})
|
|
services[service]["volumes"].append(f"{host_path}:{container_path}")
|
|
return docker_compose
|
|
|
|
|
|
@click.command(
|
|
short_help="Run all or a selection of services.",
|
|
help="Run all or a selection of services. Docker images will be rebuilt where necessary.",
|
|
)
|
|
@click.option("--skip-build", is_flag=True, help="Skip image building")
|
|
@click.option("-d", "--detach", is_flag=True, help="Start in daemon mode")
|
|
@mount_option
|
|
@click.argument("services", metavar="service", nargs=-1)
|
|
@click.pass_obj
|
|
def start(
|
|
context: BaseComposeContext,
|
|
skip_build: bool,
|
|
detach: bool,
|
|
mounts: t.Tuple[t.List[MountParam.MountType]],
|
|
services: t.List[str],
|
|
) -> None:
|
|
command = ["up", "--remove-orphans"]
|
|
if not skip_build:
|
|
command.append("--build")
|
|
if detach:
|
|
command.append("-d")
|
|
|
|
# Start services
|
|
mount_tmp_volumes(mounts, context)
|
|
config = tutor_config.load(context.root)
|
|
context.job_runner(config).docker_compose(*command, *services)
|
|
|
|
|
|
@click.command(help="Stop a running platform")
|
|
@click.argument("services", metavar="service", nargs=-1)
|
|
@click.pass_obj
|
|
def stop(context: BaseComposeContext, services: t.List[str]) -> None:
|
|
config = tutor_config.load(context.root)
|
|
context.job_runner(config).docker_compose("stop", *services)
|
|
|
|
|
|
@click.command(
|
|
short_help="Reboot an existing platform",
|
|
help="This is more than just a restart: with reboot, the platform is fully stopped before being restarted again",
|
|
)
|
|
@click.option("-d", "--detach", is_flag=True, help="Start in daemon mode")
|
|
@click.argument("services", metavar="service", nargs=-1)
|
|
@click.pass_context
|
|
def reboot(context: click.Context, detach: bool, services: t.List[str]) -> None:
|
|
context.invoke(stop, services=services)
|
|
context.invoke(start, detach=detach, services=services)
|
|
|
|
|
|
@click.command(
|
|
short_help="Restart some components from a running platform.",
|
|
help="""Specify 'openedx' to restart the lms, cms and workers, or 'all' to
|
|
restart all services. Note that this performs a 'docker-compose restart', so new images
|
|
may not be taken into account. It is useful for reloading settings, for instance. To
|
|
fully stop the platform, use the 'reboot' command.""",
|
|
)
|
|
@click.argument("services", metavar="service", nargs=-1)
|
|
@click.pass_obj
|
|
def restart(context: BaseComposeContext, services: t.List[str]) -> None:
|
|
config = tutor_config.load(context.root)
|
|
command = ["restart"]
|
|
if "all" in services:
|
|
pass
|
|
else:
|
|
for service in services:
|
|
if service == "openedx":
|
|
if config["RUN_LMS"]:
|
|
command += ["lms", "lms-worker"]
|
|
if config["RUN_CMS"]:
|
|
command += ["cms", "cms-worker"]
|
|
else:
|
|
command.append(service)
|
|
context.job_runner(config).docker_compose(*command)
|
|
|
|
|
|
@jobs.do_group
|
|
@mount_option
|
|
@click.pass_obj
|
|
def do(
|
|
context: BaseComposeContext, mounts: t.Tuple[t.List[MountParam.MountType]]
|
|
) -> None:
|
|
"""
|
|
Run a custom job in the right container(s).
|
|
"""
|
|
@hooks.Actions.DO_JOB.add()
|
|
def _mount_tmp_volumes(_job_name: str, *_args: t.Any, **_kwargs: t.Any) -> None:
|
|
"""
|
|
We add this logic to an action callback because we do not want to trigger it
|
|
whenever we run `tutor local do <job> --help`.
|
|
"""
|
|
mount_tmp_volumes(mounts, context)
|
|
|
|
|
|
@click.command(
|
|
short_help="Run a command in a new container",
|
|
help=(
|
|
"Run a command in a new container. This is a wrapper around `docker-compose run`. Any option or argument passed"
|
|
" to this command will be forwarded to docker-compose. Thus, you may use `-v` or `-p` to mount volumes and"
|
|
" expose ports."
|
|
),
|
|
context_settings={"ignore_unknown_options": True},
|
|
)
|
|
@mount_option
|
|
@click.argument("args", nargs=-1, required=True)
|
|
@click.pass_context
|
|
def run(
|
|
context: click.Context,
|
|
mounts: t.Tuple[t.List[MountParam.MountType]],
|
|
args: t.List[str],
|
|
) -> None:
|
|
extra_args = ["--rm"]
|
|
if not utils.is_a_tty():
|
|
extra_args.append("-T")
|
|
context.invoke(dc_command, mounts=mounts, command="run", args=[*extra_args, *args])
|
|
|
|
|
|
@click.command(
|
|
name="copyfrom",
|
|
help="Copy files/folders from a container directory to the local filesystem.",
|
|
)
|
|
@click.argument("service")
|
|
@click.argument("container_path")
|
|
@click.argument(
|
|
"host_path",
|
|
type=click.Path(dir_okay=True, file_okay=False, resolve_path=True),
|
|
)
|
|
@click.pass_obj
|
|
def copyfrom(
|
|
context: BaseComposeContext, service: str, container_path: str, host_path: str
|
|
) -> None:
|
|
# Path management
|
|
container_root_path = "/tmp/mount"
|
|
container_dst_path = container_root_path
|
|
if not os.path.exists(host_path):
|
|
# Emulate cp semantics, where if the destination path does not exist
|
|
# then we copy to its parent and rename to the destination folder
|
|
container_dst_path += "/" + os.path.basename(host_path)
|
|
host_path = os.path.dirname(host_path)
|
|
if not os.path.exists(host_path):
|
|
raise TutorError(
|
|
f"Cannot create directory {host_path}. No such file or directory."
|
|
)
|
|
|
|
# cp/mv commands
|
|
command = f"cp --recursive --preserve {container_path} {container_dst_path}"
|
|
config = tutor_config.load(context.root)
|
|
runner = context.job_runner(config)
|
|
runner.docker_compose(
|
|
"run",
|
|
"--rm",
|
|
"--no-deps",
|
|
"--user=0",
|
|
f"--volume={host_path}:{container_root_path}",
|
|
service,
|
|
"sh",
|
|
"-e",
|
|
"-c",
|
|
command,
|
|
)
|
|
|
|
|
|
@click.command(
|
|
short_help="Run a command in a running container",
|
|
help=(
|
|
"Run a command in a running container. This is a wrapper around `docker-compose exec`. Any option or argument"
|
|
" passed to this command will be forwarded to docker-compose. Thus, you may use `-e` to manually define"
|
|
" environment variables."
|
|
),
|
|
context_settings={"ignore_unknown_options": True},
|
|
name="exec",
|
|
)
|
|
@click.argument("args", nargs=-1, required=True)
|
|
@click.pass_context
|
|
def execute(context: click.Context, args: t.List[str]) -> None:
|
|
context.invoke(dc_command, command="exec", args=args)
|
|
|
|
|
|
@click.command(
|
|
short_help="View output from containers",
|
|
help="View output from containers. This is a wrapper around `docker-compose logs`.",
|
|
)
|
|
@click.option("-f", "--follow", is_flag=True, help="Follow log output")
|
|
@click.option("--tail", type=int, help="Number of lines to show from each container")
|
|
@click.argument("service", nargs=-1)
|
|
@click.pass_context
|
|
def logs(context: click.Context, follow: bool, tail: bool, service: str) -> None:
|
|
args = []
|
|
if follow:
|
|
args.append("--follow")
|
|
if tail is not None:
|
|
args += ["--tail", str(tail)]
|
|
args += service
|
|
context.invoke(dc_command, command="logs", args=args)
|
|
|
|
|
|
@click.command(help="Print status information for containers")
|
|
@click.pass_context
|
|
def status(context: click.Context) -> None:
|
|
context.invoke(dc_command, command="ps")
|
|
|
|
|
|
@click.command(
|
|
short_help="Direct interface to docker-compose.",
|
|
help=(
|
|
"Direct interface to docker-compose. This is a wrapper around `docker-compose`. Most commands, options and"
|
|
" arguments passed to this command will be forwarded as-is to docker-compose."
|
|
),
|
|
context_settings={"ignore_unknown_options": True},
|
|
name="dc",
|
|
)
|
|
@mount_option
|
|
@click.argument("command")
|
|
@click.argument("args", nargs=-1)
|
|
@click.pass_obj
|
|
def dc_command(
|
|
context: BaseComposeContext,
|
|
mounts: t.Tuple[t.List[MountParam.MountType]],
|
|
command: str,
|
|
args: t.List[str],
|
|
) -> None:
|
|
mount_tmp_volumes(mounts, context)
|
|
config = tutor_config.load(context.root)
|
|
context.job_runner(config).docker_compose(command, *args)
|
|
|
|
|
|
@hooks.Filters.COMPOSE_MOUNTS.add()
|
|
def _mount_edx_platform(
|
|
volumes: t.List[t.Tuple[str, str]], name: str
|
|
) -> t.List[t.Tuple[str, str]]:
|
|
"""
|
|
When mounting edx-platform with `--mount=/path/to/edx-platform`, bind-mount the host
|
|
repo in the lms/cms containers.
|
|
"""
|
|
if name == "edx-platform":
|
|
path = "/openedx/edx-platform"
|
|
volumes += [
|
|
("lms", path),
|
|
("cms", path),
|
|
("lms-worker", path),
|
|
("cms-worker", path),
|
|
("lms-job", path),
|
|
("cms-job", path),
|
|
]
|
|
return volumes
|
|
|
|
|
|
def add_commands(command_group: click.Group) -> None:
|
|
command_group.add_command(start)
|
|
command_group.add_command(stop)
|
|
command_group.add_command(restart)
|
|
command_group.add_command(reboot)
|
|
command_group.add_command(dc_command)
|
|
command_group.add_command(run)
|
|
command_group.add_command(copyfrom)
|
|
command_group.add_command(execute)
|
|
command_group.add_command(logs)
|
|
command_group.add_command(status)
|
|
|
|
@hooks.Actions.PLUGINS_LOADED.add()
|
|
def _add_do_commands() -> None:
|
|
jobs.add_job_commands(do)
|
|
command_group.add_command(do)
|