mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-12-13 14:43:03 +00:00
Merge remote-tracking branch 'origin/master' into nightly
This commit is contained in:
commit
1c093d71de
@ -402,7 +402,7 @@ Note that your edx-platform version must be a fork of the latest release **tag**
|
|||||||
|
|
||||||
If you don't create your fork from this tag, you *will* have important compatibility issues with other services. In particular:
|
If you don't create your fork from this tag, you *will* have important compatibility issues with other services. In particular:
|
||||||
|
|
||||||
- Do not try to run a fork from an older (pre-Nutmeg) version of edx-platform: this will simply not work.
|
- Do not try to run a fork from an older (pre-Olive) version of edx-platform: this will simply not work.
|
||||||
- Do not try to run a fork from the edx-platform master branch: there is a 99% probability that it will fail.
|
- Do not try to run a fork from the edx-platform master branch: there is a 99% probability that it will fail.
|
||||||
- Do not try to run a fork from the open-release/olive.master branch: Tutor will attempt to apply security and bug fix patches that might already be included in the open-release/olive.master but which were not yet applied to the latest release tag. Patch application will thus fail if you base your fork from the open-release/olive.master branch.
|
- Do not try to run a fork from the open-release/olive.master branch: Tutor will attempt to apply security and bug fix patches that might already be included in the open-release/olive.master but which were not yet applied to the latest release tag. Patch application will thus fail if you base your fork from the open-release/olive.master branch.
|
||||||
|
|
||||||
|
@ -121,11 +121,11 @@ Major Open edX releases are published twice a year, in June and December, by the
|
|||||||
4. Test the new release in a sandboxed environment.
|
4. Test the new release in a sandboxed environment.
|
||||||
5. If you are running edx-platform, or some other repository from a custom branch, then you should rebase (and test) your changes on top of the latest release tag (see :ref:`edx_platform_fork`).
|
5. If you are running edx-platform, or some other repository from a custom branch, then you should rebase (and test) your changes on top of the latest release tag (see :ref:`edx_platform_fork`).
|
||||||
|
|
||||||
The process for upgrading from one major release to the next works similarly to any other upgrade, with the ``launch`` command (see above). The single difference is that if the ``launch`` command detects that your tutor environment was generated with an older release, it will perform a few release-specific upgrade steps. These extra upgrade steps will be performed just once. But they will be ignored if you updated your local environment (for instance: with ``tutor config save``) before running ``launch``. This situation typically occurs if you need to re-build some Docker images (see above). In such a case, you should make use of the ``upgrade`` command. For instance, to upgrade a local installation from Maple to Nutmeg and rebuild some Docker images, run::
|
The process for upgrading from one major release to the next works similarly to any other upgrade, with the ``launch`` command (see above). The single difference is that if the ``launch`` command detects that your tutor environment was generated with an older release, it will perform a few release-specific upgrade steps. These extra upgrade steps will be performed just once. But they will be ignored if you updated your local environment (for instance: with ``tutor config save``) before running ``launch``. This situation typically occurs if you need to re-build some Docker images (see above). In such a case, you should make use of the ``upgrade`` command. For instance, to upgrade a local installation from Nutmeg to Olive and rebuild some Docker images, run::
|
||||||
|
|
||||||
tutor config save
|
tutor config save
|
||||||
tutor images build all # list the images that should be rebuilt here
|
tutor images build all # list the images that should be rebuilt here
|
||||||
tutor local upgrade --from=maple
|
tutor local upgrade --from=nutmeg
|
||||||
tutor local launch
|
tutor local launch
|
||||||
|
|
||||||
.. _autocomplete:
|
.. _autocomplete:
|
||||||
|
@ -22,7 +22,7 @@ Yes :) This is what happens when you run ``tutor local launch``:
|
|||||||
2. Configuration files are generated from templates.
|
2. Configuration files are generated from templates.
|
||||||
3. Docker images are downloaded.
|
3. Docker images are downloaded.
|
||||||
4. Docker containers are provisioned.
|
4. Docker containers are provisioned.
|
||||||
5. A full, production-ready Open edX platform (`Nutmeg <https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/open-release-olive.master/platform_releases/olive.html>`__ release) is run with docker-compose.
|
5. A full, production-ready Open edX platform (`Olive <https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/open-release-olive.master/platform_releases/olive.html>`__ release) is run with docker-compose.
|
||||||
|
|
||||||
The whole procedure should require less than 10 minutes, on a server with good bandwidth. Note that your host environment will not be affected in any way, since everything runs inside docker containers. Root access is not even necessary.
|
The whole procedure should require less than 10 minutes, on a server with good bandwidth. Note that your host environment will not be affected in any way, since everything runs inside docker containers. Root access is not even necessary.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user