Skip to content

Commit 78ab999

Browse files
authored
Updating the docs (mageddo#674)
1 parent ea6cc34 commit 78ab999

8 files changed

Lines changed: 50 additions & 8 deletions

File tree

docs/content/2-features/_index.en.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ pre: "<b>2. </b>"
66

77
## DNS Features List
88

9-
* [🟡 Authoritative][1]
9+
* [ Authoritative][1]
1010
* [✅ Recursive][2]
11-
* [❌ Recursion ACL][3]
1211
* ✅ Secondary mode
1312
* [✅ Caching][4]
1413
* [✅ IPv6][7]
1514
* [✅ Wildcard][8]
15+
* [🟡 DNS over HTTPS][10]
16+
* [❌ Recursion ACL][3]
1617
* [❌ Split horizon][9]
17-
* [❌ DNS over HTTPS][10]
1818
* [❌ DNS over QUIC][11]
1919
* [❓DNSSEC][5]
2020
* [❓TSIG][6]
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: Docker Solver
3+
weight: 2
4+
---
5+
6+
## Features
7+
8+
{{%children style="li" %}}
9+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
title: Disable specific containers from solve
3+
---
4+
5+
If you want to prevent a specific container from be resolved from Docker Solver then
6+
you can set docker label `dps.container.enabled=false`.
7+
8+
Example
9+
10+
```bash
11+
docker run --rm --name nginx-disabled -l "dps.container.enabled=false" nginx
12+
```
13+
14+
Or docker-compose.yml
15+
16+
```yaml
17+
services:
18+
nginx-disabled:
19+
image: nginx
20+
container_name: nginx-disabled
21+
labels:
22+
dps.container.enabled: "false"
23+
```
24+
25+
```bash
26+
$ nslookup nginx-disabled.docker -po=5354 127.0.0.1
27+
Server: 127.0.0.1
28+
Address: 127.0.0.1#5354
29+
30+
** server can't find nginx-disabled.docker: NXDOMAIN
31+
```

docs/content/2-features/docker-different-networks-solving/_index.en.md renamed to docs/content/2-features/solver-docker/docker-different-networks-solving/_index.en.md

File renamed without changes.

docs/content/2-features/dps-network-resolution/_index.en.md renamed to docs/content/2-features/solver-docker/dps-network-resolution/_index.en.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: DPS Docker Network
3-
weight: 9
43
---
54
Since: 2.15.0
65

docs/content/2-features/docker-solving/_index.en.md renamed to docs/content/2-features/solver-docker/solve-from-hostname/_index.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Solving Docker Containers from Hostname
3-
weight: 4
3+
weight: 1
44
---
55

66
DPS can assign a hostname to your docker containers to solve it's IPs by the :
@@ -10,7 +10,7 @@ DPS can assign a hostname to your docker containers to solve it's IPs by the :
1010
* Container Name
1111
* Docker Compose Service Name
1212

13-
These are indivual forms of set a hostname to a container to query it, so you only need to use one of them.
13+
These are individual forms of set a hostname to a container to query it, so you only need to use one of them.
1414

1515
## Hostnames Env
1616

docs/content/2-features/specify-from-which-network-solve-container/_index.en.md renamed to docs/content/2-features/solver-docker/specify-from-which-network-solve-container/_index.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Specify from which network solve container IP
3-
weight: 8
3+
weight: 2
44
---
55

66
If your container have multiple networks then you can specify which network to use when solving IP by specifying `dps.network` label.

docs/content/3-configuration/_index.en.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ Common DNS resolution mechanisms used by DPS. Solvers are evaluated according to
6464
| `solver.docker.hostMachineFallback` | Whether the host machine IP should be returned when a container is found but has no IP. | `true` |
6565
| `solver.docker.dockerDaemonUri` | Docker daemon URI used to connect to Docker. | OS dependent |
6666

67+
[Click here][7] to see more docker solver features.
68+
6769
#### DPS Network
6870

6971
| Name | Description | Default Value |
@@ -230,4 +232,5 @@ log:
230232
[3]: {{%relref "2-features/remote-solver-circuitbreaker/_index.en.md" %}}
231233
[4]: {{%relref "3-configuration/legacy.en.md" %}}
232234
[5]: {{%relref "3-configuration/format.en.md" %}}
233-
[6]: {{%relref "2-features/specify-from-which-network-solve-container/_index.en.md" %}}
235+
[6]: {{%relref "2-features/solver-docker/specify-from-which-network-solve-container/_index.en.md" %}}
236+
[7]: {{%relref "2-features/solver-docker/_index.en.md" %}}

0 commit comments

Comments
 (0)