Skip to content

Commit c348f72

Browse files
committed
docs: fix linter warnings in markdown
1 parent d673a59 commit c348f72

File tree

2 files changed

+49
-36
lines changed

2 files changed

+49
-36
lines changed

README.md

+31-27
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Torrust Tracker
22

3-
[![container_wf_b]][container_wf] [![coverage_wf_b]][coverage_wf] [![deployment_wf_b]][deployment_wf] [![testing_wf_b]][testing_wf]
4-
5-
__Torrust Tracker__, is a [BitTorrent][bittorrent] Tracker that matchmakes peers and collects statistics. Written in [Rust Language][rust] with the [axum] web framework. ___This tracker aims to be respectful to established standards, (both [formal][BEP 00] and [otherwise][torrent_source_felid]).___
3+
[![container_wf_b]][container_wf] [![coverage_wf_b]][coverage_wf] [![deployment_wf_b]][deployment_wf] [![testing_wf_b]][testing_wf]**Torrust Tracker** is a [BitTorrent][bittorrent] Tracker that matchmakes peers and collects statistics. Written in [Rust Language][rust] with the [Axum] web framework. _**This tracker aims to be respectful to established standards, (both [formal][BEP 00] and [otherwise][torrent_source_felid]).___
64

75
> This is a [Torrust][torrust] project and is in active development. It is community supported as well as sponsored by [Nautilus Cyberneering][nautilus].
86
@@ -20,41 +18,44 @@ __Torrust Tracker__, is a [BitTorrent][bittorrent] Tracker that matchmakes peers
2018
- [x] Persistent `SQLite3` or `MySQL` Databases.
2119

2220
## Implemented BitTorrent Enhancement Proposals (BEPs)
21+
>
2322
> _[Learn more about BitTorrent Enhancement Proposals][BEP 00]_
2423
25-
- [BEP 03] : The BitTorrent Protocol.
26-
- [BEP 07] : IPv6 Support.
27-
- [BEP 15] : UDP Tracker Protocol for BitTorrent.
28-
- [BEP 23] : Tracker Returns Compact Peer Lists.
29-
- [BEP 27] : Private Torrents.
30-
- [BEP 48] : Tracker Protocol Extension: Scrape.
24+
- [BEP 03]: The BitTorrent Protocol.
25+
- [BEP 07]: IPv6 Support.
26+
- [BEP 15]: UDP Tracker Protocol for BitTorrent.
27+
- [BEP 23]: Tracker Returns Compact Peer Lists.
28+
- [BEP 27]: Private Torrents.
29+
- [BEP 48]: Tracker Protocol Extension: Scrape.
3130

3231
## Getting Started
3332

3433
### Container Version
3534

3635
The Torrust Tracker is [deployed to DockerHub][dockerhub], you can run a demo immediately with the following commands:
3736

38-
#### Docker:
37+
#### Docker
3938

4039
```sh
4140
docker run -it torrust/tracker:develop
4241
```
42+
4343
> Please read our [container guide][containers.md] for more information.
4444
45-
#### Podman:
45+
#### Podman
4646

4747
```sh
4848
podman run -it docker.io/torrust/tracker:develop
4949
```
50+
5051
> Please read our [container guide][containers.md] for more information.
5152
5253
### Development Version
5354

54-
- Please assure you have the ___[latest stable (or nightly) version of rust][rust]___.
55-
- Please assure that you computer has enough ram. ___Recommended 16GB.___
55+
- Please ensure you have the _**[latest stable (or nightly) version of rust][rust]___.
56+
- Please ensure that your computer has enough RAM. _**Recommended 16GB.___
5657

57-
#### Checkout, Test and Run:
58+
#### Checkout, Test and Run
5859

5960
```sh
6061
# Checkout repository into a new folder:
@@ -71,7 +72,8 @@ cargo test --tests --benches --examples --workspace --all-targets --all-features
7172
# Run the tracker:
7273
cargo run
7374
```
74-
#### Customization:
75+
76+
#### Customization
7577

7678
```sh
7779
# Copy the default configuration into the standard location:
@@ -92,7 +94,7 @@ _Optionally, you may choose to supply the entire configuration as an environment
9294
TORRUST_TRACKER_CONFIG=$(cat "./storage/tracker/etc/tracker.toml") cargo run
9395
```
9496

95-
_For deployment you __should__ override the `api_admin_token` by using an environmental variable:_
97+
_For deployment, you **should** override the `api_admin_token` by using an environmental variable:_
9698

9799
```sh
98100
# Generate a Secret Token:
@@ -105,9 +107,10 @@ TORRUST_TRACKER_CONFIG=$(cat "./storage/tracker/etc/tracker.toml") \
105107
cargo run
106108
```
107109

108-
> Please view our [crate documentation][documentation] for more detailed instructions.
110+
> Please view our [crate documentation][docs] for more detailed instructions.
109111
110112
### Services
113+
111114
The following services are provided by the default configuration:
112115

113116
- UDP _(tracker)_
@@ -119,19 +122,20 @@ The following services are provided by the default configuration:
119122

120123
## Documentation
121124

122-
- [Management API (Version 1)][api]
123-
- [Tracker (HTTP/TLS)][http]
124-
- [Tracker (UDP)][udp]
125+
- [Management API (Version 1)][API]
126+
- [Tracker (HTTP/TLS)][HTTP]
127+
- [Tracker (UDP)][UDP]
125128

126129
## Contributing
130+
127131
We are happy to support and welcome new people to our project. Please consider our [contributor guide][guide.md].</br>
128-
This is an open-source community supported project. We welcome contributions from the community!
132+
This is an open-source community-supported project. We welcome contributions from the community!
129133

130-
__How can you contribute?__
134+
**How can you contribute?**
131135

132136
- Bug reports and feature requests.
133137
- Code contributions. You can start by looking at the issues labeled "[good first issues]".
134-
- Documentation improvements. Check the [documentation][docs] and [API documentation][api] for typos, errors, or missing information.
138+
- Documentation improvements. Check the [documentation][docs] and [API documentation][API] for typos, errors, or missing information.
135139
- Participation in the community. You can help by answering questions in the [discussions].
136140

137141
## License
@@ -151,11 +155,13 @@ Some files include explicit copyright notices and/or license notices.
151155
For prosperity, versions of Torrust Tracker that are older than five years are automatically granted the [MIT-0][MIT_0] license in addition to the existing [AGPL-3.0-only][AGPL_3_0] license.
152156

153157
## Contributor Agreement
158+
154159
The copyright of the Torrust Tracker is retained by the respective authors.
155160

156161
**Contributors agree:**
157-
- That all their contributions be granted a license(s) **compatible** with the [Torrust Trackers License](#License).
158-
- That all contributors signal **clearly** and **explicitly** any other compilable licenses if they are not: *[AGPL-3.0-only with the legacy MIT-0 exception](#License)*.
162+
163+
- That all their contributions be granted a license(s) **compatible** with the [Torrust Trackers License](#license).
164+
- That all contributors signal **clearly** and **explicitly** any other compilable licenses if they are not: _[AGPL-3.0-only with the legacy MIT-0 exception](#license)_.
159165

160166
**The Torrust-Tracker project has no copyright assignment agreement.**
161167

@@ -165,8 +171,6 @@ _We kindly ask you to take time and consider The Torrust Project [Contributor Ag
165171

166172
This project was a joint effort by [Nautilus Cyberneering GmbH][nautilus] and [Dutch Bits]. Also thanks to [Naim A.] and [greatest-ape] for some parts of the code. Further added features and functions thanks to [Power2All].
167173

168-
169-
170174
[container_wf]: ../../actions/workflows/container.yaml
171175
[container_wf_b]: ../../actions/workflows/container.yaml/badge.svg
172176
[coverage_wf]: ../../actions/workflows/coverage.yaml

docs/containers.md

+18-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Containers (Docker or Podman)
22

33
## Demo environment
4+
45
It is simple to setup the tracker with the default
56
configuration and run it using the pre-built public docker image:
67

7-
88
With Docker:
99

1010
```sh
@@ -17,11 +17,12 @@ or with Podman:
1717
podman run -it docker.io/torrust/tracker:latest
1818
```
1919

20-
2120
## Requirements
21+
2222
- Tested with recent versions of Docker or Podman.
2323

2424
## Volumes
25+
2526
The [Containerfile](../Containerfile) (i.e. the Dockerfile) Defines Three Volumes:
2627

2728
```Dockerfile
@@ -38,19 +39,22 @@ When instancing the container image with the `docker run` or `podman run` comman
3839

3940
> NOTE: You can adjust this mapping for your preference, however this mapping is the default in our guides and scripts.
4041
41-
### Pre-Create Host-Mapped Folders:
42+
### Pre-Create Host-Mapped Folders
43+
4244
Please run this command where you wish to run the container:
4345

4446
```sh
4547
mkdir -p ./storage/tracker/lib/ ./storage/tracker/log/ ./storage/tracker/etc/
4648
```
4749

4850
### Matching Ownership ID's of Host Storage and Container Volumes
51+
4952
It is important that the `torrust` user has the same uid `$(id -u)` as the host mapped folders. In our [entry script](../share/container/entry_script_sh), installed to `/usr/local/bin/entry.sh` inside the container, switches to the `torrust` user created based upon the `USER_UID` environmental variable.
5053

5154
When running the container, you may use the `--env USER_ID="$(id -u)"` argument that gets the current user-id and passes to the container.
5255

5356
### Mapped Tree Structure
57+
5458
Using the standard mapping defined above produces this following mapped tree:
5559

5660
```s
@@ -78,6 +82,7 @@ git clone https://github.com/torrust/torrust-tracker.git; cd torrust-tracker
7882
```
7983

8084
### (Docker) Setup Context
85+
8186
Before starting, if you are using docker, it is helpful to reset the context to the default:
8287

8388
```sh
@@ -107,6 +112,7 @@ podman build --target debug --tag torrust-tracker:debug --file Containerfile .
107112
## Running the Container
108113

109114
### Basic Run
115+
110116
No arguments are needed for simply checking the container image works:
111117

112118
#### (Docker) Run Basic
@@ -118,6 +124,7 @@ docker run -it torrust-tracker:release
118124
# Debug Mode
119125
docker run -it torrust-tracker:debug
120126
```
127+
121128
#### (Podman) Run Basic
122129

123130
```sh
@@ -129,11 +136,13 @@ podman run -it docker.io/torrust-tracker:debug
129136
```
130137

131138
### Arguments
139+
132140
The arguments need to be placed before the image tag. i.e.
133141

134142
`run [arguments] torrust-tracker:release`
135143

136-
#### Environmental Variables:
144+
#### Environmental Variables
145+
137146
Environmental variables are loaded through the `--env`, in the format `--env VAR="value"`.
138147

139148
The following environmental variables can be set:
@@ -148,8 +157,8 @@ The following environmental variables can be set:
148157
- `API_PORT` - The port for the tracker API. This should match the port used in the configuration, (default `1212`).
149158
- `HEALTH_CHECK_API_PORT` - The port for the Health Check API. This should match the port used in the configuration, (default `1313`).
150159

151-
152160
### Sockets
161+
153162
Socket ports used internally within the container can be mapped to with the `--publish` argument.
154163

155164
The format is: `--publish [optional_host_ip]:[host_port]:[container_port]/[optional_protocol]`, for example: `--publish 127.0.0.1:8080:80/tcp`.
@@ -164,7 +173,8 @@ The default ports can be mapped with the following:
164173

165174
> NOTE: Inside the container it is necessary to expose a socket with the wildcard address `0.0.0.0` so that it may be accessible from the host. Verify that the configuration that the sockets are wildcard.
166175
167-
### Volumes
176+
### Host-mapped Volumes
177+
168178
By default the container will use install volumes for `/var/lib/torrust/tracker`, `/var/log/torrust/tracker`, and `/etc/torrust/tracker`, however for better administration it good to make these volumes host-mapped.
169179

170180
The argument to host-map volumes is `--volume`, with the format: `--volume=[host-src:]container-dest[:<options>]`.
@@ -177,10 +187,9 @@ The default mapping can be supplied with the following arguments:
177187
--volume ./storage/tracker/etc:/etc/torrust/tracker:Z \
178188
```
179189

180-
181190
Please not the `:Z` at the end of the podman `--volume` mapping arguments, this is to give read-write permission on SELinux enabled systemd, if this doesn't work on your system, you can use `:rw` instead.
182191

183-
## Complete Example:
192+
## Complete Example
184193

185194
### With Docker
186195

@@ -257,7 +266,7 @@ $ docker ps
257266
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
258267
06feacb91a9e torrust-tracker "cargo run" 18 minutes ago Up 4 seconds 0.0.0.0:1212->1212/tcp, :::1212->1212/tcp, 0.0.0.0:7070->7070/tcp, :::7070->7070/tcp, 0.0.0.0:6969->6969/udp, :::6969->6969/udp torrust-tracker-1
259268
34d29e792ee2 mysql:8.0 "docker-entrypoint.s…" 18 minutes ago Up 5 seconds (healthy) 0.0.0.0:3306->3306/tcp, :::3306->3306/tcp, 33060/tcp torrust-mysql-1
260-
```
269+
```
261270

262271
And you should be able to use the application, for example making a request to the API:
263272

0 commit comments

Comments
 (0)