Skip to content

Commit 146950d

Browse files
committed
admin settings configuration
1 parent 1a25a62 commit 146950d

File tree

3 files changed

+95
-7
lines changed

3 files changed

+95
-7
lines changed

content/manuals/desktop/features/networking.md

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,93 @@ Depending on your selected network mode, the options available are:
107107
108108
### Using Settings Management
109109

110-
If you're an administrator, you can use Settings Management to enforce this Docker Desktop setting across your developer's machines. Add the following to your `admin-settings.json` file and swap in your chosen network mode and DNS resolution behavior
110+
If you're an administrator, you can use Settings Management to enforce this Docker Desktop setting across your developer's machines. Choose from the following code snippets and at it to your `admin-settings.json` file.
111111

112-
- TODO
112+
{{< tabs >}}
113+
{{< tab name="Networking mode" >}}
113114

115+
Dual IPv4/IPv6:
114116

117+
```json
118+
{
119+
"networkingMode": {
120+
"locked": true
121+
"value": dual-stack
122+
}
123+
}
124+
```
125+
126+
IPv4 only:
127+
128+
```json
129+
{
130+
"networkingMode": {
131+
"locked": true
132+
"value": ipv4only
133+
}
134+
}
135+
```
136+
137+
IPv6 only:
138+
139+
```json
140+
{
141+
"networkingMode": {
142+
"locked": true
143+
"value": ipv6only
144+
}
145+
}
146+
```
147+
148+
{{< /tab >}}
149+
{{< tab name="DNS resolution" >}}
150+
151+
Auto filter:
152+
153+
```json
154+
{
155+
"DnsInhibition": {
156+
"locked": true
157+
"value": auto
158+
}
159+
}
160+
```
161+
162+
Filter IPv4:
163+
164+
```json
165+
{
166+
"DnsInhibition": {
167+
"locked": true
168+
"value": ipv4
169+
}
170+
}
171+
```
172+
173+
Filter IPv6:
174+
175+
```json
176+
{
177+
"DnsInhibition": {
178+
"locked": true
179+
"value": ipv6
180+
}
181+
}
182+
```
183+
184+
No filter:
185+
186+
```json
187+
{
188+
"DnsInhibition": {
189+
"locked": true
190+
"value": none
191+
}
192+
}
193+
```
194+
195+
{{< /tab >}}
196+
{{< /tabs >}}
115197

116198
## Networking features for Mac and Linux
117199

content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,10 @@ quit and reopened.
305305

306306
|Parameter|OS|Description|Version|
307307
|:-------------------------------|---|:-------------------------------|---|
308+
| `defaultNetworkingMode` | Windows and Mac only | Defines the default IP protocol for new Docker networks: `dual-stack` (IPv4 + IPv6, default), `ipv4only`, or `ipv6only`. | Docker Desktop version 4.42 and later. |
309+
| `DnsInhibition` | Windows and Mac only | Controls DNS record filtering returned to containers. Options: `auto` (recommended), `ipv4`, `ipv6`, `none`| Docker Desktop version 4.42 and later. |
308310

309-
TODO
311+
For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows).
310312

311313
### Features in development
312314

content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,27 +517,31 @@ settings.
517517

518518
| Default value | Accepted values | Format |
519519
|---------------|-----------------|----------|
520-
| `Dual IPv4/IPv6` | `IPv4 only`, `IPv6 only` | String |
520+
| `dual-stack` | `ipv4only`, `ipv6only` | String |
521521

522522
- **Description:** Set the networking mode.
523523
- **OS:** {{< badge color=blue text="Windows and Mac" >}}
524524
- **Use case:** Choose the default IP protocol used when Docker creates new networks.
525525
- **Configure this setting with:**
526526
- **Network** Resources settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
527-
- Settings Management: TODO setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
527+
- Settings Management: `defaultNetworkingMode` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
528+
529+
For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows).
528530

529531
#### Inhibit DNS resolution for IPv4/IPv6
530532

531533
| Default value | Accepted values | Format |
532534
|---------------|-----------------|----------|
533-
| `Auto` | `Filter IPv4 (A records)`, `Filter IPv6 (AAAA records)` | String |
535+
| `auto` | `ipv4`, `ipv6`, `none` | String |
534536

535537
- **Description:** Filters unsupported DNS record types.
536538
- **OS:** {{< badge color=blue text="Windows and Mac" >}}
537539
- **Use case:** Control how Docker filters DNS records returned to containers, improving reliability in environments where only IPv4 or IPv6 is supported.
538540
- **Configure this setting with:**
539541
- **Network** Resources settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
540-
- Settings Management: TODO setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
542+
- Settings Management: `DnsInhibition` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
543+
544+
For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows).
541545

542546
### Enable WSL engine
543547

0 commit comments

Comments
 (0)