From 09a458f818286fcee396afd005f93b469b391ab7 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:20:19 +0100 Subject: [PATCH] ENGDOCS-2105 (#20092) * ENGDOCS-2015 * fix callout * Apply suggestions from code review --- content/desktop/hardened-desktop/air-gapped-containers.md | 8 ++------ .../hardened-desktop/settings-management/_index.md | 2 +- .../hardened-desktop/settings-management/configure.md | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/content/desktop/hardened-desktop/air-gapped-containers.md b/content/desktop/hardened-desktop/air-gapped-containers.md index e2c07816cb..e66e76dfe8 100644 --- a/content/desktop/hardened-desktop/air-gapped-containers.md +++ b/content/desktop/hardened-desktop/air-gapped-containers.md @@ -6,13 +6,9 @@ aliases: - /desktop/hardened-desktop/settings-management/air-gapped-containers/ --- -> **Beta feature** -> -> This feature is in [Beta](../../release-lifecycle.md/#beta). -> It's available with Docker Desktop version 4.29 and later. -{ .experimental } +{{< introduced desktop 4.29.0 "../release-notes.md#4290" >}} -Air-gapped containers allows administrators to restrict containers from accessing network resources, limiting where data can be uploaded to or downloaded from. +Air-Gapped Containers allows administrators to restrict containers from accessing network resources, limiting where data can be uploaded to or downloaded from. Docker Desktop can apply a custom set of proxy rules to network traffic from containers. The proxy can be configured to: diff --git a/content/desktop/hardened-desktop/settings-management/_index.md b/content/desktop/hardened-desktop/settings-management/_index.md index 7328e544fe..048e1f9f6a 100644 --- a/content/desktop/hardened-desktop/settings-management/_index.md +++ b/content/desktop/hardened-desktop/settings-management/_index.md @@ -45,7 +45,7 @@ Using the `admin-settings.json` file, admins can: - Turn off Docker Desktop's onboarding survey - Control the file sharing implementation for your developers on macOS - Specify which paths your developers can add file shares to -- Configure air-gapped containers (Beta) +- Configure Air-Gapped Containers For more details on the syntax and options admins can set, see [Configure Settings Management](configure.md). diff --git a/content/desktop/hardened-desktop/settings-management/configure.md b/content/desktop/hardened-desktop/settings-management/configure.md index df79872dfa..8eb55951cf 100644 --- a/content/desktop/hardened-desktop/settings-management/configure.md +++ b/content/desktop/hardened-desktop/settings-management/configure.md @@ -183,7 +183,7 @@ The following `admin-settings.json` code and table provides an example of the re | `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.| | `proxy` | |If `mode` is set to `system` instead of `manual`, Docker Desktop gets the proxy values from the system and ignores and values set for `http`, `https` and `exclude`. Change `mode` to `manual` to manually configure proxy servers. If the proxy port is custom, specify it in the `http` or `https` property, for example `"https": "http://myotherproxy.com:4321"`. The `exclude` property specifies a comma-separated list of hosts and domains to bypass the proxy. | |        `windowsDockerdPort` | Windows only | Exposes Docker Desktop's internal proxy locally on this port for the Windows Docker daemon to connect to. If it is set to 0, a random free port is chosen. If the value is greater than 0, use that exact value for the port. The default value is -1 which disables the option. Note: This is available for Windows containers only. | -| `containersProxy` (Beta) | | Allows you to create air-gapped containers. For more information see [Air-gapped containers](../air-gapped-containers.md).| +| `containersProxy` (Beta) | | Allows you to create air-gapped containers. For more information see [Air-Gapped Containers](../air-gapped-containers.md).| | `enhancedContainerIsolation` | | If `value` is set to true, Docker Desktop runs all containers as unprivileged, via the Linux user-namespace, prevents them from modifying sensitive configurations inside the Docker Desktop VM, and uses other advanced techniques to isolate them. For more information, see [Enhanced Container Isolation](../enhanced-container-isolation/index.md).| |        `dockerSocketMount` | | By default, enhanced container isolation blocks bind-mounting the Docker Engine socket into containers (e.g., `docker run -v /var/run/docker.sock:/var/run/docker.sock ...`). This allows admins to relax this in a controlled way. See [ECI Configuration](../enhanced-container-isolation/config.md) for more info. | |               `imageList` | | Indicates which container images are allowed to bind-mount the Docker Engine socket. |