Skip to content

Commit 5452cf4

Browse files
committed
Update documentation format for new builder
1 parent 0ec9b76 commit 5452cf4

18 files changed

+118
-107
lines changed

Diff for: configuration.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
## Configuration
22

3-
``` toctree::
4-
:maxdepth: 2
5-
:caption: Table of Contents
6-
:glob:
3+
```{toctree}
4+
---
5+
maxdepth: 2
6+
caption: Table of Contents
7+
glob:
8+
---
79
8-
configuration/*
10+
configuration/*
911
```

Diff for: configuration/blackfire.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Blackfire Profiling
1+
# Blackfire Profiling
22

33
For information on what Blackfire is, please see the [introduction to Blackfire](https://blackfire.io/docs/introduction) in Blackfire documentation.
44

@@ -15,7 +15,7 @@ BLACKFIRE_SERVER_TOKEN=<server_token>
1515

1616
Note: You can obtain the IDs and Tokens used in the above from within your Blackfire account under Account Settings -> Credentials or from the credentials are of the environment you're pushing profile information into.
1717

18-
### CLI Tool
18+
## CLI Tool
1919

2020
To use the Blackfire CLI Tool, you can run `warden blackfire [arguments]`.
2121

Diff for: configuration/database.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## Database Connections
1+
# Database Connections
22

3-
### Common Settings
3+
## Common Settings
44

55
| Name | Value/Description |
66
| ------------------------------ |----------------------------------------------------------------- |
@@ -14,20 +14,20 @@
1414
| SSH User | `user` |
1515
| SSH private key file | `~/.warden/tunnel/ssh_key` |
1616

17-
### TablePlus
17+
## TablePlus
1818
![TablePlus Connection Info](screenshots/tableplus-connection.png)
1919

20-
### Sequel Pro / Sequel Ace
20+
## Sequel Pro / Sequel Ace
2121
![Sequel Pro Connection Info](screenshots/sequel-pro-connection.png)
2222

23-
### PhpStorm
23+
## PhpStorm
2424
![PHPStorm Connection Config](screenshots/66998481-a0062100-f0d4-11e9-8cc0-a5691fee59c5.png)
2525
![PHPStorm Tunnel Config](screenshots/66998483-a09eb780-f0d4-11e9-9643-8fe63dd62aad.png)
2626
![PHPStorm Tunnel Config - Windows WSL2](screenshots/123906068-2ed7d180-d97c-11eb-9e52-ec48f6753ee7.png)
2727

28-
### Navicat for MySQL
28+
## Navicat for MySQL
2929
![Navicat Connection Config](screenshots/navicat-connection-config.png)
3030
![Navicat Tunnel Config](screenshots/navicat-ssh-tunnel-config.png)
3131

32-
### MySQL Workbench
32+
## MySQL Workbench
3333
![MySQL Workbench](screenshots/mysql-workbench-connection.png)

Diff for: configuration/dns-resolver.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
## Automatic DNS Resolution
1+
# Automatic DNS Resolution
22

33
In order to allow automatic DNS resolution using the provided dnsmasq service we will need to make sure DNS request are routed through our local network.
44
This requires some configuration.
55

6-
### Configuration per network
6+
## Configuration per network
77

8-
#### Mac
8+
### Mac
99

1010
On Mac OS, DNS resolution is configured automatically for `*.test` domains using a feature Mac OS inherits from BSD. When `warden install` is run (or `warden svc up` for the first time) the following contents are placed in the `/etc/resolver/test` file. This has the effect of having zero impact on DNS queries except for those under the `.test` TLD.
1111

@@ -21,7 +21,7 @@ If you desire to have more than this route through the `dnsmasq` container, you
2121
1.0.0.1
2222
```
2323

24-
#### systemd-resolved
24+
### systemd-resolved
2525

2626
This approach works on most modern (systemd based) operating systems.
2727

@@ -32,7 +32,7 @@ This approach works on most modern (systemd based) operating systems.
3232
| sudo tee /etc/systemd/resolved.conf.d/warden.conf > /dev/null
3333
sudo systemctl restart systemd-resolved
3434

35-
#### Ubuntu resolvconf
35+
### Ubuntu resolvconf
3636

3737
Use the `resolvconf` service to add a permanent entry in your `/etc/resolv.conf` file.
3838

@@ -57,11 +57,11 @@ Restart network-manager
5757
sudo service network-manager restart
5858
```
5959

60-
``` note::
60+
```{note}
6161
In the above examples you can replace ``1.1.1.1`` and ``1.0.0.1`` (CloudFlare) with the IP of your own preferred DNS resolution service such as ``8.8.8.8`` and ``8.8.4.4`` (Google) or ``9.9.9.9`` and ``149.112.112.112`` (Quad9)
6262
```
6363

64-
#### Windows
64+
### Windows
6565

6666
Add the local dnsmasq resolver as the first DNS server:
6767

Diff for: configuration/livereload.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
## LiveReload Setup
1+
# LiveReload Setup
22

33
LiveReload routing is currently supported only on the `magento2` environment type. Other environment types may utilize LiveReload via per-project compose configurations to setup the routing for LiveReload JS and WebSocket endpoints.
44

5-
### Configuration for Magento 2
5+
## Configuration for Magento 2
66

77
Magento 2 bundles an example grunt based server-side compilation workflow which includes LiveReload and it works within the Warden shell environment. In order to use this:
88

@@ -29,7 +29,7 @@ Magento 2 bundles an example grunt based server-side compilation workflow which
2929
];
3030
```
3131

32-
``` note::
32+
```{note}
3333
This can be accomplished via alternative means, the important part is the browser requesting ``/livereload.js?port=443`` when running the site on your local development environment.
3434
```
3535

@@ -51,7 +51,7 @@ Magento 2 bundles an example grunt based server-side compilation workflow which
5151
grunt watch
5252
```
5353

54-
``` note::
54+
```{note}
5555
Grunt should be used within the php-fpm container entered via ``warden shell``
5656
```
5757

Diff for: configuration/magento2-testing.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ That's it! Now you are ready to run Unit Tests.
3535

3636
### Debugging
3737

38-
If you have [configured Xdebug](xdebug.md), run Unit tests inside **Debug** console (`warden debug` instead of `warden shell`). The code execution will stop at the breakpoints.
38+
If you have {doc}`configured Xdebug <xdebug>`, run Unit tests inside **Debug** console (`warden debug` instead of `warden shell`). The code execution will stop at the breakpoints.
3939

4040
## Running Javascript Unit Tests
4141

@@ -133,7 +133,7 @@ There's one thing you should be aware of: **always provide full path to `phpunit
133133

134134
### Debugging
135135

136-
If you have [configured Xdebug](xdebug.md), run Integration tests inside **Debug** console (`warden debug` instead of `warden shell`). The code execution will stop at the breakpoints.
136+
If you have {doc}`configured Xdebug <xdebug>`, run Integration tests inside **Debug** console (`warden debug` instead of `warden shell`). The code execution will stop at the breakpoints.
137137

138138

139139
### Troubleshooting
@@ -203,7 +203,7 @@ There's one thing you should be aware of: **always provide full path to `phpunit
203203

204204
### Debugging
205205

206-
If you have [configured Xdebug](xdebug.md), run Integration tests inside **Debug** console (`warden debug` instead of `warden shell`). The code execution will stop at the breakpoints.
206+
If you have {doc}`configured Xdebug <xdebug>`, run Integration tests inside **Debug** console (`warden debug` instead of `warden shell`). The code execution will stop at the breakpoints.
207207

208208
## Running API Functional Tests
209209

@@ -282,12 +282,13 @@ When debugging APIs you may need to use Xdebug - configure your `phpunit_{type}.
282282

283283
- `TESTS_XDEBUG_ENABLED` to `true`
284284
- `TESTS_XDEBUG_SESSION` to `phpstorm`
285-
285+
286+
(magento2-testing-running-mftf-tests)=
286287
## Running MFTF Tests
287288

288289
All the MFTF-related operations are operated by `vendor/bin/mftf`, necessary files are located in `dev/tests/acceptance/`.
289290

290-
To run Acceptance tests you need to [configure the MFTF environment](mftf.md). Once you've done that, follow these steps to run the tests.
291+
To run Acceptance tests you need to {doc}`configure the MFTF environment <mftf>`. Once you've done that, follow these steps to run the tests.
291292
292293
1. Make sure that you enabled following in your `.env` file:
293294
- `WARDEN_SELENIUM` - Responsible for running virtual browser for your tests
@@ -320,7 +321,7 @@ To run Acceptance tests you need to [configure the MFTF environment](mftf.md). O
320321
321322
### Debugging
322323
323-
For more information about Debugging MFTF - please follow the [Magento Functional Testing Framework](mftf.md) section.
324+
For more information about Debugging MFTF - please follow the {doc}`Magento Functional Testing Framework <mftf>` section.
324325
The process of debugging is based on VNC connection to the Chrome instance.
325326
326327
You can connect to Chrome session with `warden vnc` command.

Diff for: configuration/mftf.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Magento Functional Testing Framework
1+
# Magento Functional Testing Framework
22

33
For information what **Magento Functional Testing Framework** is - please follow to [MFTF DevDocs](https://devdocs.magento.com/mftf/docs/introduction.html).
44

@@ -15,11 +15,11 @@ SELENIUM_HOST=selenium
1515
BROWSER=chrome
1616
```
1717

18-
### Running Tests
18+
## Running Tests
1919

20-
We provide complex instruction on [How to run MFTF Tests](magento2-testing.html#running-mftf-tests) in Warden environment.
20+
We provide complex instruction on {ref}`How to run MFTF Tests <magento2-testing-running-mftf-tests>` in Warden environment.
2121

22-
### Debugging MFTF Tests
22+
## Debugging MFTF Tests
2323

2424
By default Warden uses headless Chrome browser. If you want to preview the tests - you need to extend `.env` file and update environment containers (`warden env up`)
2525

@@ -31,15 +31,15 @@ WARDEN_SELENIUM_DEBUG=1
3131

3232
To preview the process of testing, you need any **VLC** client that provides **SSH Tunnel** support (eg. [Remmina](https://remmina.org/how-to-install-remmina/)). To preview the process of testing, you need to use `tunnel.warden.test:2222` (login: `user`):
3333

34-
### Remote Desktop Viewer
34+
## Remote Desktop Viewer
3535

3636
![Remote Desktop Viewer](screenshots/selenium-remote-desktop-viewer.png)
3737

38-
### Remmina
38+
## Remmina
3939

4040
![Remmina Configuration](screenshots/remmina-ssh-tunnel.png)
4141

42-
### Mac OS X
42+
## Mac OS X
4343

4444
To preview the process in Mac OS X, you must first create an SSH tunnel to the docker instance hosting the VNC server. That would look something like:
4545

Diff for: configuration/multipledomains.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Multiple Domains
1+
# Multiple Domains
22

33
If you need multiple domains configured for your project, Warden will now automatically route all sub-domains of the configured `TRAEFIK_DOMAIN` (as given when running `env-init`) to the Varnish/Nginx containers provided there is not a more specific rule such as for example `rabbitmq.exampleproject.com` which routes to the `rabbitmq` service for the project.
44

@@ -38,7 +38,7 @@ Multiple top-level domains may also be setup by following the instructions below
3838
3939
4. Run `warden env up` to update the containers, after which each of the URLs should work as expected.
4040

41-
``` note::
41+
```{note}
4242
If these alternate domains must be resolvable from within the FPM containers, you must also leverage ``extra_hosts`` to add each specific sub-domain to the ``/etc/hosts`` file of the container as dnsmasq is used only on the host machine, not inside the containers. This should look something like the following excerpt.
4343
4444
```
@@ -65,7 +65,7 @@ Multiple top-level domains may also be setup by following the instructions below
6565
- sub2.alternate2.test:${TRAEFIK_ADDRESS:-0.0.0.0}
6666
```
6767

68-
### Magento 2 Run Params
68+
## Magento 2 Run Params
6969

7070
When multiple domains are being used to load different stores or websites on Magento 2, the following configuration should be defined in order to set run codes and types as needed.
7171

@@ -100,7 +100,7 @@ When multiple domains are being used to load different stores or websites on Mag
100100
}
101101
```
102102

103-
``` note::
103+
```{note}
104104
The above example will not alter production site behavior given the default is to return should the ``HTTP_HOST`` value not match one of the defined ``case`` statements. This is desired as some hosting environments define run codes and types in an Nginx mapping. One may add production host names to the switch block should it be desired to use the same site switching mechanism across all environments.
105105
```
106106

@@ -116,7 +116,7 @@ When multiple domains are being used to load different stores or websites on Mag
116116
}
117117
```
118118

119-
``` note::
119+
```{note}
120120
This is similar to using `magento-vars.php` on Magento Commerce Cloud, but using composer to load the file rather than relying on Commerce Cloud magic: https://devdocs.magento.com/guides/v2.3/cloud/project/project-multi-sites.html
121121
```
122122

Diff for: configuration/xdebug.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Xdebug Support
1+
# Xdebug Support
22

33
There are two docker containers running FPM, `php-fpm`, `php-debug`. The `php-debug` container has the **Xdebug** extension pre-installed. Nginx will automatically route requests to the `php-debug` container when the `XDEBUG_SESSION` cookie has been set to `PHPSTORM` via the Xdebug Helper browser extension.
44

@@ -12,7 +12,7 @@ In similar fashion to the `warden shell` command there is also a debug command t
1212
warden debug
1313
```
1414

15-
### VSCode
15+
## VSCode
1616

1717
To configure a project in VSCode for debugging, add the following to `.vscode/launch.json` in the project directory:
1818

@@ -33,15 +33,15 @@ To configure a project in VSCode for debugging, add the following to `.vscode/la
3333
}
3434
```
3535

36-
``` note::
36+
```{note}
3737
If your project has (for example) ``WARDEN_WEB_ROOT=/webroot`` in it's ``.env`` file, to mount ``webroot/`` to ``/var/www/html`` rather than the top-level project directory, you may need to set the ``pathMapping`` above to ``${workspaceRoot}/webroot`` for the mapping to function correctly.
3838
```
3939

4040
Once this configuration is in place, make sure you have the [PHP Debug extension by Felix Becker](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-debug) installed. This is required for Xdebug support to function in VSCode. Additional information on launch settings specific to Xdebug use in VSCode [may be found here](https://github.com/felixfbecker/vscode-php-debug#vs-code-configuration).
4141

4242
To learn more about debugging in VSCode, [please go here](https://code.visualstudio.com/docs/editor/debugging).
4343

44-
### PhpStorm
44+
## PhpStorm
4545

4646
When it receives the first request, PHP Storm should prompt you if the "Server" configuration is missing. The below image demonstrates how this is setup; the important settings are these:
4747

Diff for: environments.md

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
## Environments
22

3-
``` toctree::
4-
:maxdepth: 2
5-
:caption: Table of Contents
6-
:glob:
3+
```{toctree}
4+
---
5+
maxdepth: 2
6+
caption: Table of Contents
7+
glob:
8+
---
79
8-
environments/types
9-
environments/magento2
10-
environments/shopware
11-
environments/*
10+
environments/types
11+
environments/magento2
12+
environments/shopware
13+
environments/*
1214
```

Diff for: environments/customizing.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Customizing An Environment
1+
# Customizing An Environment
22

33
Further information on customizing or extending an environment is forthcoming. For now, this section is limited to very simple and somewhat common customizations.
44

@@ -21,13 +21,13 @@ Start of some environments could be skipped by using variables in `.env` file:
2121
* `WARDEN_DB=0`
2222
* `WARDEN_REDIS=0`
2323

24-
### Docker Specific Customizations
24+
## Docker Specific Customizations
2525
To override default docker settings, add a custom configuration file in your project root
2626
folder: `/.warden/warden-env.yml`
2727
This file will be merged with the default environment configuration.
2828
One example for a use case is [the setup of multiple domains](https://docs.warden.dev/configuration/multipledomains.html?highlight=warden%20env%20yml#multiple-domains).
2929

30-
### PHP Specific Customizations
30+
## PHP Specific Customizations
3131
To override default php settings, follow the docker customization above and include your custom `php.ini` file.
3232
In this case the `warden-env.yml` should look like this:
3333

@@ -58,7 +58,7 @@ post_max_size = 25M
5858
session.auto_start = Off
5959
upload_max_filesize = 25M
6060
```
61-
### Nginx Specific Customizations
61+
## Nginx Specific Customizations
6262
To override the default nginx configuration of your project, add a new file
6363
`.warden/warden-env.yml` to your project root with the following content:
6464
```
@@ -70,12 +70,12 @@ services:
7070
```
7171
There you can specify a custom Nginx configuration which will be included following the `.conf` files within the `/etc/nginx/available.d` directory: `include /etc/nginx/default.d/*.conf`
7272

73-
### Magento 1 Specific Customizations
73+
## Magento 1 Specific Customizations
7474

7575
If you use a `modman` structure, initialize the environment in your project path.
7676
The `.modman` folder and the corresponding `.basedir` file will be recognized and set up automatically.
7777

78-
### Magento 2 Specific Customizations
78+
## Magento 2 Specific Customizations
7979

8080
The following variables can be added to the project's `.env` file to enable additional database containers for use with the Magento 2 (Commerce Only) [split-database solution](https://devdocs.magento.com/guides/v2.3/config-guide/multi-master/multi-master.html).
8181

Diff for: environments/magento2.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Installing Magento 2
1+
# Installing Magento 2
22

33
The below example demonstrates the from-scratch setup of the Magento 2 application for local development. A similar process can easily be used to configure an environment of any other type. This assumes that Warden has been previously started via `warden svc up` as part of the installation procedure.
44

Diff for: environments/shopware.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Installing Shopware 6
1+
# Installing Shopware 6
22

33
The below example demonstrates the from-scratch setup of the Shopware 6 application for local development. A similar process can easily be used to configure an environment of any other type. This assumes that Warden has been previously started via `warden svc up` as part of the installation procedure.
44

0 commit comments

Comments
 (0)