Skip to content

Commit bb2485e

Browse files
committed
admin-settings: add note regarding KinD + ECI config.
Signed-off-by: Cesar Talledo <[email protected]>
1 parent 830a2f1 commit bb2485e

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ The following `admin-settings.json` code and table provides an example of the re
182182
}
183183
```
184184

185-
### General
185+
### General
186186

187187
|Parameter|OS|Description|Version|
188188
|:-------------------------------|---|:-------------------------------|---|
@@ -195,7 +195,7 @@ The following `admin-settings.json` code and table provides an example of the re
195195
| `desktopTerminalEnabled` | | If `value` is set to `false`, developers cannot use the Docker terminal to interact with the host machine and execute commands directly from Docker Desktop. | |
196196
|`exposeDockerAPIOnTCP2375`| Windows only| Exposes the Docker API on a specified port. If `value` is set to true, the Docker API is exposed on port 2375. Note: This is unauthenticated and should only be enabled if protected by suitable firewall rules.| |
197197

198-
### File sharing and emulation
198+
### File sharing and emulation
199199

200200
|Parameter|OS|Description|Version|
201201
|:-------------------------------|---|:-------------------------------|---|
@@ -241,7 +241,7 @@ The following `admin-settings.json` code and table provides an example of the re
241241
| &nbsp; &nbsp; &nbsp; &nbsp;`dockerDaemonOptions` | | Overrides the options in the Linux daemon config file. See the [Docker Engine reference](/reference/cli/dockerd/#daemon-configuration-file).| |
242242

243243
> [!NOTE]
244-
>
244+
>
245245
> This setting is not available to configure via the Docker Admin Console.
246246
247247
### Kubernetes
@@ -250,15 +250,24 @@ The following `admin-settings.json` code and table provides an example of the re
250250
|:-------------------------------|---|:-------------------------------|---|
251251
|`kubernetes`| | If `enabled` is set to true, a Kubernetes single-node cluster is started when Docker Desktop starts. If `showSystemContainers` is set to true, Kubernetes containers are displayed in the Docker Desktop Dashboard and when you run `docker ps`. `imagesRepository` lets you specify which repository Docker Desktop pulls the Kubernetes images from. For example, `"imagesRepository": "registry-1.docker.io/docker"`. | |
252252

253-
### Features in development
253+
> [!NOTE]
254+
>
255+
> When using a custom image repository via the `imagesRepository` setting, and if Enhanced Container Isolation (ECI) is enabled, add the following images to the [ECI Docker Socket mount images list](#enhanced-container-isolation):
256+
>
257+
> <custom-image-repo>/desktop-cloud-provider-kind:*
258+
> <custom-image-repo>/desktop-containerd-registry-mirror:*
259+
>
260+
> The containers based on these images mount the Docker socket, so the images must be added to the ECI images list as otherwise ECI will block the mount.
261+
262+
### Features in development
254263

255264
|Parameter|OS|Description|Version|
256265
|:-------------------------------|---|:-------------------------------|---|
257266
| `allowExperimentalFeatures`| | If `value` is set to `false`, experimental features are disabled.| |
258267
| `allowBetaFeatures`| | If `value` is set to `false`, beta features are disabled.| |
259268
| `enableDockerAI` | | If `value` is set to `false`, Docker AI (Ask Gordon) features are disabled. | |
260269

261-
### Enhanced Container Isolation
270+
### Enhanced Container Isolation
262271

263272
|Parameter|OS|Description|Version|
264273
|:-------------------------------|---|:-------------------------------|---|
@@ -282,4 +291,4 @@ For settings to take effect:
282291
283292
So as not to disrupt your developers' workflow, Docker doesn't automatically mandate that developers re-launch and re-authenticate once a change has been made.
284293

285-
In Docker Desktop, developers see the relevant settings grayed out.
294+
In Docker Desktop, developers see the relevant settings grayed out.

0 commit comments

Comments
 (0)