diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cc6a95..41078fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- 💥[Improvement] Remove `dev/local pullimages`. Instead, run `dev/local dc pull`. - 💥[Improvement] Add `dev dc` and `local dc` commands as thin wrappers of the `docker-compose` CLI. - 💥[Improvement] Remove the undocumented `local run_hook` command. Instead, run `local init --limit=...`. - 💥[Improvement] Remove `tutor android pullimage` command. Instead, run `tutor images pull android`. diff --git a/docs/configuration.rst b/docs/configuration.rst index 7b29683..18064b9 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -198,7 +198,7 @@ Custom Open edX docker image There are different ways you can customise your Open edX platform. For instance, optional features can be activated during configuration. But if you want to add unique features to your Open edX platform, you are going to have to modify and re-build the ``openedx`` docker image. This is the image that contains the ``edx-platform`` repository: it is in charge of running the web application for the Open edX "core". Both the LMS and the CMS run from the ``openedx`` docker image. -On a vanilla platform deployed by Tutor, the image that is run is downloaded from the `overhangio/openedx repository on Docker Hub `_. This is also the image that is downloaded whenever we run ``tutor local pullimages``. But you can decide to build the image locally instead of downloading it. To do so, build and tag the ``openedx`` image:: +On a vanilla platform deployed by Tutor, the image that is run is downloaded from the `overhangio/openedx repository on Docker Hub `_. This is also the image that is downloaded whenever we run ``tutor images pull openedx``. But you can decide to build the image locally instead of downloading it. To do so, build and tag the ``openedx`` image:: tutor images build openedx diff --git a/docs/local.rst b/docs/local.rst index 0b89505..fa589b9 100644 --- a/docs/local.rst +++ b/docs/local.rst @@ -47,9 +47,9 @@ Update docker images :: - tutor local pullimages + tutor local dc pull -This downloads the latest version of the docker images from `Docker Hub `_. Depending on your bandwidth, this might take a long time. Minor image updates will be incremental, and thus much faster. +This downloads the latest version of the Docker images from `Docker Hub `_. Depending on your bandwidth, this might take a long time. Minor image updates will be incremental, and thus much faster. Running Open edX ~~~~~~~~~~~~~~~~ diff --git a/tutor/commands/compose.py b/tutor/commands/compose.py index 676326c..7db0ae6 100644 --- a/tutor/commands/compose.py +++ b/tutor/commands/compose.py @@ -71,13 +71,6 @@ class ScriptRunner(scripts.BaseRunner): ) -@click.command(help="Update docker images") -@click.pass_obj -def pullimages(context): - config = tutor_config.load(context.root) - context.docker_compose(context.root, config, "pull") - - @click.command(help="Run all or a selection of configured Open edX services") @click.option("-d", "--detach", is_flag=True, help="Start in daemon mode") @click.argument("services", metavar="service", nargs=-1) @@ -254,7 +247,6 @@ def logs(follow, tail, service): def add_commands(command_group): - command_group.add_command(pullimages) command_group.add_command(start) command_group.add_command(stop) command_group.add_command(restart) diff --git a/tutor/commands/local.py b/tutor/commands/local.py index 14a5ce2..349d3fe 100644 --- a/tutor/commands/local.py +++ b/tutor/commands/local.py @@ -61,7 +61,7 @@ def quickstart(context, non_interactive, pullimages_): https_create.callback() if pullimages_: click.echo(fmt.title("Docker image updates")) - compose.pullimages.callback() + compose.dc_command.callback(["pull"]) click.echo(fmt.title("Starting the platform in detached mode")) compose.start.callback(True, []) click.echo(fmt.title("Database creation and migrations"))