Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 3ba99fd

Browse files
committed
docs: Fix links broken due to refactor in previous commit
This changes a number of links to `:doc:` or `:ref:` links, and removes the readme.rst inclusion (now that the README is very small). It also adds the new pages to the table of contents, and moves Workflow to a higher position.
1 parent cd17f72 commit 3ba99fd

8 files changed

Lines changed: 30 additions & 30 deletions

README.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Where to Find Help
1616

1717
There are a number of places to get help, including mailing lists and real-time chat. Please choose an appropriate venue for your question. This helps ensure that you get good prompt advice, and keeps discussion focused. For details of your options, see the `Community`_ pages.
1818

19-
- See the `most common development workflow`_ (after you've finished `Getting Started`_).
19+
- See the `most common development workflow`_ (after you've finished :doc:`getting_started`).
2020
- See the `Devstack Interface`_
2121
- See some `helpful troubleshooting tips`_.
2222
- See the `Frequently Asked Questions`_.
@@ -38,13 +38,8 @@ You can also browse all the documentation in `Read the Docs`_.
3838
Notices
3939
-------
4040

41-
**NOTE:** LMS is now using MySql 5.7 by default. You have to run ``make dev.pull.lms`` and ``make dev.provision.lms`` (more details in `Getting Started`_) to fetch latest images and reprovision local copies of databases in order for an existing devstack setup to keep working.
41+
**NOTE:** LMS is now using MySql 5.7 by default. You have to run ``make dev.pull.lms`` and ``make dev.provision.lms`` (more details in :doc:`getting_started`) to fetch latest images and reprovision local copies of databases in order for an existing devstack setup to keep working.
4242

43-
.. _Docker Compose: https://docs.docker.com/compose/
44-
.. _Docker for Mac: https://docs.docker.com/docker-for-mac/
45-
.. _licensing terms: https://www.docker.com/pricing/faq
46-
.. _Docker for Windows: https://docs.docker.com/docker-for-windows/
47-
.. _configuring Docker for Mac: https://docs.docker.com/docker-for-mac/#/advanced
4843
.. _feature added in Docker 17.05: https://github.com/openedx/configuration/pull/3864
4944
.. _edx-e2e-tests README: https://github.com/edx/edx-e2e-tests/#how-to-run-lms-and-studio-tests
5045
.. _edxops Docker image: https://hub.docker.com/r/edxops/
@@ -61,5 +56,4 @@ Notices
6156
:alt: Documentation Status
6257
:scale: 100%
6358
:target: https://edx.readthedocs.io/projects/open-edx-devstack/en/latest/
64-
.. _Python virtualenv: https://docs.python-guide.org/en/latest/dev/virtualenvs/#lower-level-virtualenv
6559
.. _Community: https://open.edx.org/community/connect/

docs/developing_on_named_release_branches.rst

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,29 @@ Developing on Open edX named release branches
33

44
.. contents:: Table of Contents
55

6-
By default, the startup steps in `README.rst`_ will install the devstack using the master branch of all repos. If you want to install a named release instead, follow these steps before pulling the docker images in step 3 of the `Getting Started`_ guide:
6+
By default, the startup steps in :doc:`getting_started` will install the devstack using the master branch of all repos. If you want to install a named release instead, follow these steps before the step that pulls the docker images:
77

88
#. Set the ``OPENEDX_RELEASE`` environment variable to the appropriate image
99
tag; "hawthorn.master", "zebrawood.rc1", etc. Note that unlike a server
1010
install, ``OPENEDX_RELEASE`` should not have the "open-release/" prefix.
1111
#. Check out the appropriate branch in devstack, e.g. ``git checkout open-release/ironwood.master``
1212
#. Use ``make dev.checkout`` to check out the correct branch in the local
1313
checkout of each service repository
14-
#. Continue with step 3 in the `getting started`_ guide to pull the correct docker images.
14+
#. Continue with step 3 in :doc:`getting_started` to pull the correct docker images.
1515

1616
All ``make`` target and ``docker-compose`` calls should now use the correct
1717
images until you change or unset ``OPENEDX_RELEASE`` again. To work on the
1818
master branches and ``latest`` images, unset ``OPENEDX_RELEASE`` or set it to
1919
an empty string.
2020

21-
.. _README.rst: https://github.com/openedx/devstack
22-
.. _getting started: https://github.com/openedx/devstack#getting-started
23-
2421
How do I run multiple named Open edX releases on same machine?
2522
--------------------------------------------------------------
2623
You can have multiple isolated Devstacks provisioned on a single computer now. Follow these directions **after installing at least two devstacks** to switch between them.
2724

28-
#. If you haven't done so, follow the steps in the `Getting Started`_ section, to install the master devstack or any other named release. We recommend that you have at least one devstack on the master branch.
25+
#. If you haven't done so, follow the steps in :doc:`getting_started`, to install the master devstack or any other named release. We recommend that you have at least one devstack on the master branch.
2926
#. Change directory to your devstack and activate the virtual env.
3027
#. Stop any running containers by issuing a ``make dev.stop``.
31-
#. Follow the steps in `Getting Started`_ section again, setting the additional OPENEDX_RELEASE you want to install in step 2
28+
#. Follow the steps in :doc:`getting_started` again, setting the additional OPENEDX_RELEASE you want to install in step 2
3229

3330
The implication of this is that you can switch between isolated Devstack databases by changing the value of the ``OPENEDX_RELEASE`` environment variable.
3431

docs/getting_started.rst

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ If you are using Linux, use the ``overlay2`` storage driver, kernel version
3838
3939
docker info | grep -i 'storage driver'
4040
41+
.. _Docker for Mac: https://docs.docker.com/docker-for-mac/
42+
.. _licensing terms: https://www.docker.com/pricing/faq
43+
.. _configuring Docker for Mac: https://docs.docker.com/docker-for-mac/#/advanced
44+
.. _Docker for Windows: https://docs.docker.com/docker-for-windows/
45+
4146
Please note
4247
~~~~~~~~~~~
4348

@@ -46,15 +51,15 @@ from within a Virtual Machine, as these commands are meant to stand up a VM-like
4651
Docker containers.
4752

4853
However, you may want to run the ``make`` commands from within a Python 3 virtual
49-
environment, as described in `Getting Started`_. This will keep the Python packages required for Devstack separate from
54+
environment. This will keep the Python packages required for Devstack separate from
5055
the ones installed globally on your system.
5156

5257
Directions to setup devstack
5358
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5459

5560
The default devstack services can be run by following the steps below.
5661

57-
**Note:** This will set up a large number of services, more than you are likely to need to work with, but that's only necessary for first-time provisioning. See `Service List`_ and the `most common development workflow`_ for how to run and update devstack with just the services you need, rather than the ``large-and-slow`` default set.
62+
**Note:** This will set up a large number of services, more than you are likely to need to work with, but that's only necessary for first-time provisioning. See :doc:`service_list` and the :doc:`most common development workflow <workflow>` for how to run and update devstack with just the services you need, rather than the ``large-and-slow`` default set.
5863

5964
#. Install the requirements inside of a `Python virtualenv`_.
6065

@@ -164,4 +169,6 @@ This data collection is behind a consent flag, so please help devstack's maintai
164169
165170
make metrics-opt-in
166171
167-
Now that you're up and running, read about the `most common development workflow`_.
172+
Now that you're up and running, read about the :doc:`most common development workflow <workflow>`.
173+
174+
.. _Python virtualenv: https://docs.python-guide.org/en/latest/dev/virtualenvs/#lower-level-virtualenv

docs/index.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Open edX Devstack
2-
=================
2+
#################
33

44
Devstack is the local Docker-based environment for developing in the Open edX platform.
55

@@ -29,25 +29,31 @@ It also includes the following extra components:
2929
* The course-authoring micro-frontend
3030
* The enhanced staff grader (ora-grading) micro-frontend
3131

32-
Contents:
32+
.. _Docker Compose: https://docs.docker.com/compose/
33+
34+
Contents
35+
********
3336

3437
.. toctree::
3538
:maxdepth: 2
3639

37-
readme
40+
getting_started
41+
logging_in
42+
workflow
43+
service_list
3844
devstack_interface
3945
devstack_faq
40-
workflow
4146
building-images
4247
database-dumps
4348
devpi
4449
developing_on_named_release_branches
4550
pycharm_integration
4651
testing_and_debugging
4752
troubleshoot_general_tips
53+
advanced_configuration
4854

4955
Indices and tables
50-
==================
56+
******************
5157

5258
* :ref:`genindex`
5359
* :ref:`modindex`

docs/pycharm_integration.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Prerequisites
1010
-------------
1111

1212
1. You must complete all steps for provisioning your Docker Devstack environment
13-
in the `README`_ before proceeding with the PyCharm setup.
13+
in :doc:`getting_started` before proceeding with the PyCharm setup.
1414

1515
2. If you are on a Mac, make sure you are on a newer version than macOS
1616
Yosemite. A this time, this should work with either El Capitan or Sierra.
@@ -343,5 +343,4 @@ One way to do this is to follow these instructions:
343343
.. _Jetbrains ticket PY-22893: https://youtrack.jetbrains.com/issue/PY-22893
344344
.. _PyCharm: https://www.jetbrains.com/pycharm/
345345
.. _PyCharm IDE setup: https://openedx.atlassian.net/wiki/spaces/AC/pages/92209229/PyCharm
346-
.. _README: ../README.rst
347346
.. _vendor documentation: https://www.jetbrains.com/help/pycharm/2017.1/configuring-remote-interpreters-via-docker-compose.html

docs/readme.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/service_list.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ as well as links to the repository where each service's code lives.
88

99
Most developers will be best served by working with specific combinations of these services, for example ``make dev.pull.studio`` or ``make dev.up.ecommerce``. These will pull in dependencies as needed—starting ecommerce will also start lms, and lms will pull in forums, discovery, and others. If you need multiple, they can be listed like ``make dev.up.studio+ecommerce``. After the service table below there is a list of some common combinations.
1010

11-
Instead of a service name or list, you can also run commands like ``make dev.provision`` / ``make dev.pull.large-and-slow`` / ``make dev.up.large-and-slow``. This is a larger list than most people will need for most of their work, and includes all of the services marked "Default" in the below table. (Some of these targets use ``large-and-slow`` in their name as a warning; others may be changed to use this over time.) However, you can change this list by modifying the ``DEFAULT_SERVICES`` option as described in the `Advanced Configuration Options`_ section.
11+
Instead of a service name or list, you can also run commands like ``make dev.provision`` / ``make dev.pull.large-and-slow`` / ``make dev.up.large-and-slow``. This is a larger list than most people will need for most of their work, and includes all of the services marked "Default" in the below table. (Some of these targets use ``large-and-slow`` in their name as a warning; others may be changed to use this over time.) However, you can change this list by modifying the ``DEFAULT_SERVICES`` option as described in :doc:`advanced_configuration`.
1212

1313
+------------------------------------+-------------------------------------+----------------+--------------+
1414
| Service | URL | Type | Role |

docs/workflow.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ You can routinely create backups of your local databases. To create a backup, us
5858
Running micro-frontends outside of devstack
5959
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6060

61-
Although several micro-frontends (MFEs) are built into devstack (the full list is in the `service table`_), some users prefer to run those MFEs directly on their host machine. You can achieve this by first removing the devstack MFE container, and then starting the host version. For example::
61+
Although several micro-frontends (MFEs) are built into devstack (the full list is in :doc:`service_list`), some users prefer to run those MFEs directly on their host machine. You can achieve this by first removing the devstack MFE container, and then starting the host version. For example::
6262

6363
make dev.down.frontend-app-learning # Bring down the devstack version of the Learning MFE.
6464
cd <path-to-frontend-app-learning> # Navigate to the Learning MFE's repository.
@@ -67,5 +67,3 @@ Although several micro-frontends (MFEs) are built into devstack (the full list i
6767
Of course ``learning`` can be replaced with ``gradebook``, ``payment``, or another frontend-app name.
6868

6969
If you forget to bring down the devstack version of the MFE, you will notice a port conflict when trying to start the host version.
70-
71-
.. _service table: ../README.rst#service-list

0 commit comments

Comments
 (0)