Skip to content

Commit 3b64beb

Browse files
authored
ENGDOCS-2180 (#20594)
* ENGDOCS-2180 * link fix * final link fix * remove old page * remove old page links
1 parent d444610 commit 3b64beb

38 files changed

+136
-347
lines changed

content/admin/faqs/organization-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ No. Organization owners can invite users with their email address, and also assi
2828

2929
Yes. You can [enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md) and some benefits are:
3030

31-
- Administrators can enforce features like [Image Access Management](../../security/for-admins/image-access-management.md) and [Registry Access Management](../../security/for-admins/registry-access-management.md).
31+
- Administrators can enforce features like [Image Access Management](/security/for-admins/hardened-desktop/image-access-management.md) and [Registry Access Management](../../security/for-admins/hardened-desktop/registry-access-management.md).
3232
- Administrators can ensure compliance by blocking Docker Desktop usage for users who don't sign in as members of the organization.
3333

3434
### If a user has their personal email associated with a user account in Docker Hub, do they have to convert to using the organization's domain before they can be invited to join an organization?

content/admin/organization/orgs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ configure your organization.
9999
- **Settings**: Displays information about your
100100
organization, and allows you to view and change your repository privacy
101101
settings, configure org permissions such as
102-
[Image Access Management](../../security/for-admins/image-access-management.md), configure notification settings, and [deactivate](../deactivate-account.md#deactivate-an-organization) You can also update your organization name and company name that appear on your organization landing page. You must be an owner to access the
102+
[Image Access Management](/security/for-admins/hardened-desktop/image-access-management.md), configure notification settings, and [deactivate](../deactivate-account.md#deactivate-an-organization) You can also update your organization name and company name that appear on your organization landing page. You must be an owner to access the
103103
organization's **Settings** page.
104104

105105
- **Billing**: Displays information about your existing

content/desktop/get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ In large enterprises where admin access is restricted, administrators can [enfor
4141

4242
- Authenticated users also get a higher pull rate limit compared to anonymous users. For example, if you are authenticated, you get 200 pulls per 6 hour period, compared to 100 pulls per 6 hour period per IP address for anonymous users. For more information, see [Download rate limit](../docker-hub/download-rate-limit.md).
4343

44-
- Improve your organization’s security posture for containerized development by taking advantage of [Hardened Desktop](hardened-desktop/index.md).
44+
- Improve your organization’s security posture for containerized development by taking advantage of [Hardened Desktop](/security/for-admins/hardened-desktop/index.md).
4545

4646
> **Note**
4747
>

content/desktop/install/mac-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ The `install` command accepts the following flags:
106106
- `--accept-license`: Accepts the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement) now, rather than requiring it to be accepted when the application is first run.
107107
- `--allowed-org=<org name>`: Requires the user to sign in and be part of the specified Docker Hub organization when running the application
108108
- `--user=<username>`: Performs the privileged configurations once during installation. This removes the need for the user to grant root privileges on first run. For more information, see [Privileged helper permission requirements](../mac/permission-requirements.md#permission-requirements). To find the username, enter `ls /Users` in the CLI.
109-
- `--admin-settings`: Automatically creates an `admin-settings.json` file which is used by administrators to control certain Docker Desktop settings on client machines within their organization. For more information, see [Settings Management](../hardened-desktop/settings-management/index.md).
109+
- `--admin-settings`: Automatically creates an `admin-settings.json` file which is used by administrators to control certain Docker Desktop settings on client machines within their organization. For more information, see [Settings Management](/security/for-admins/hardened-desktop/settings-management/index.md).
110110
- It must be used together with the `--allowed-org=<org name>` flag.
111111
- For example:
112112
`--allowed-org=<org name> --admin-settings='{"configurationFileVersion": 2, "enhancedContainerIsolation": {"value": true, "locked": false}}'`
@@ -117,7 +117,7 @@ The `install` command accepts the following flags:
117117

118118
> **Tip**
119119
>
120-
> As an IT administrator, you can use endpoint management (MDM) software to identify the number of Docker Desktop instances and their versions within your environment. This can provide accurate license reporting, help ensure your machines use the latest version of Docker Desktop, and enable you to [enforce sign-in](../../security/for-admins/configure-sign-in.md).
120+
> As an IT administrator, you can use endpoint management (MDM) software to identify the number of Docker Desktop instances and their versions within your environment. This can provide accurate license reporting, help ensure your machines use the latest version of Docker Desktop, and enable you to [enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md).
121121
> - [Intune](https://learn.microsoft.com/en-us/mem/intune/apps/app-discovered-apps)
122122
> - [Jamf](https://docs.jamf.com/10.25.0/jamf-pro/administrator-guide/Application_Usage.html)
123123
> - [Kandji](https://support.kandji.io/support/solutions/articles/72000559793-view-a-device-application-list)

content/desktop/install/msi/install-and-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ msiexec /x "DockerDesktop.msi" /quiet
183183
| :--- | :--- | :--- |
184184
| `ENABLEDESKTOPSHORTCUT` | Creates a desktop shortcut. | 1 |
185185
| `INSTALLFOLDER` | Specifies a custom location where Docker Desktop will be installed. | C:\Program Files\Docker |
186-
| `ADMINSETTINGS` | Automatically creates an `admin-settings.json` file which is used to [control certain Docker Desktop settings](../../hardened-desktop/settings-management/_index.md) on client machines within organizations. It must be used together with the `ALLOWEDORG` property. | None |
186+
| `ADMINSETTINGS` | Automatically creates an `admin-settings.json` file which is used to [control certain Docker Desktop settings](/security/for-admins/hardened-desktop/settings-management/_index.md) on client machines within organizations. It must be used together with the `ALLOWEDORG` property. | None |
187187
| `ALLOWEDORG` | Requires the user to sign in and be part of the specified Docker Hub organization when running the application. This creates a registry key called `allowedOrgs` in `HKLM\Software\Policies\Docker\Docker Desktop`. | None |
188188
| `ALWAYSRUNSERVICE` | Lets users switch to Windows containers without needing admin rights | 0 |
189189
| `DISABLEWINDOWSCONTAINERS` | Disables the Windows containers integration | 0 |

content/desktop/install/windows-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ The `install` command accepts the following flags:
217217
- `--allowed-org=<org name>`: Requires the user to sign in and be part of the specified Docker Hub organization when running the application
218218
- `--backend=<backend name>`: Selects the default backend to use for Docker Desktop, `hyper-v`, `windows` or `wsl-2` (default)
219219
- `--installation-dir=<path>`: Changes the default installation location (`C:\Program Files\Docker\Docker`)
220-
- `--admin-settings`: Automatically creates an `admin-settings.json` file which is used by admins to control certain Docker Desktop settings on client machines within their organization. For more information, see [Settings Management](../hardened-desktop/settings-management/index.md).
220+
- `--admin-settings`: Automatically creates an `admin-settings.json` file which is used by admins to control certain Docker Desktop settings on client machines within their organization. For more information, see [Settings Management](/security/for-admins/hardened-desktop/settings-management/index.md).
221221
- It must be used together with the `--allowed-org=<org name>` flag.
222222
- For example:
223223

@@ -267,7 +267,7 @@ Docker Desktop does not start automatically after installation. To start Docker
267267

268268
> **Tip**
269269
>
270-
> As an IT administrator, you can use endpoint management (MDM) software to identify the number of Docker Desktop instances and their versions within your environment. This can provide accurate license reporting, help ensure your machines use the latest version of Docker Desktop, and enable you to [enforce sign-in](../../security/for-admins/configure-sign-in.md).
270+
> As an IT administrator, you can use endpoint management (MDM) software to identify the number of Docker Desktop instances and their versions within your environment. This can provide accurate license reporting, help ensure your machines use the latest version of Docker Desktop, and enable you to [enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md).
271271
> - [Intune](https://learn.microsoft.com/en-us/mem/intune/apps/app-discovered-apps)
272272
> - [Jamf](https://docs.jamf.com/10.25.0/jamf-pro/administrator-guide/Application_Usage.html)
273273
> - [Kandji](https://support.kandji.io/support/solutions/articles/72000559793-view-a-device-application-list)

content/desktop/mac/permission-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ retain their original permissions.
176176
## Enhanced Container Isolation
177177

178178
In addition, Docker Desktop supports [Enhanced Container Isolation
179-
mode](../hardened-desktop/enhanced-container-isolation/_index.md) (ECI),
179+
mode](/security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md) (ECI),
180180
available to Business customers only, which further secures containers without
181181
impacting developer workflows.
182182

content/desktop/release-notes.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL
133133

134134
- Improved instructions for `watch` in the Compose File Viewer
135135
- Added support for Golang projects that don't have dependencies in Docker Init. Addresses [docker/roadmap#611](https://github.com/docker/roadmap/issues/611)
136-
- [Settings Management](hardened-desktop/settings-management/index.md) now lets admins set the default value to `ProxyEnableKerberosNTLM`.
136+
- [Settings Management](/security/for-admins/hardened-desktop/settings-management/index.md) now lets admins set the default value to `ProxyEnableKerberosNTLM`.
137137
- Removed a temporary compatibility fix for older versions of Visual Studio Code.
138138
- Builds view:
139139
- Changed icon for imported build record to a "files" icon.
@@ -196,7 +196,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL
196196

197197
### New
198198

199-
- [Air-Gapped Containers](desktop/hardened-desktop/air-gapped-containers.md) is now generally available.
199+
- [Air-Gapped Containers](/security/for-admins/hardened-desktop/air-gapped-containers.md) is now generally available.
200200
- Docker Compose File Viewer shows your Compose YAML with syntax highlighting and contextual links to relevant docs (Beta, progressive rollout).
201201
- New Sidebar user experience.
202202

@@ -220,7 +220,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL
220220
- Added `proxyEnableKerberosNTLM` config to `settings.json` to enable fallback to basic proxy authentication if Kerberos/NTLM environment is not properly set up.
221221
- Fixed a bug where Docker Debug was not working properly with Enhanced Container Isolation enabled.
222222
- Fixed a bug where UDP responses were not truncated properly.
223-
- Fixed a bug where the **Update** screen was hidden when using [Settings Management](hardened-desktop/settings-management/_index.md).
223+
- Fixed a bug where the **Update** screen was hidden when using [Settings Management](/security/for-admins/hardened-desktop/settings-management/_index.md).
224224
- Fixed a bug where proxy settings defined in `admin-settings.json` were not applied correctly on startup.
225225
- Fixed a bug where the **Manage Synchronized file shares with Compose** toggle did not correctly reflect the value with the feature.
226226
- Fixed a bug where a bind mounted file modified on host is not updated after the container restarts, when gRPC FUSE file sharing is used on macOS and on Windows with Hyper-V. Fixes [docker/for-mac#7274](https://github.com/docker/for-mac/issues/7274), [docker/for-win#14060](https://github.com/docker/for-win/issues/14060).
@@ -285,7 +285,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL
285285
#### For all platforms
286286

287287
- Docker Desktop now supports [SOCKS5 proxies](networking.md#socks5-proxy-support). Requires a Business subscription.
288-
- Added a new setting to manage the onboarding survey in [Settings Management](hardened-desktop/settings-management/_index.md).
288+
- Added a new setting to manage the onboarding survey in [Settings Management](/security/for-admins/hardened-desktop/settings-management/_index.md).
289289

290290
#### For Windows
291291

@@ -364,14 +364,14 @@ This can be resolved by adding the user to the **docker-users** group. Before st
364364

365365
### New
366366

367-
- You can now enforce Rosetta usage via [Settings Management](hardened-desktop/settings-management/configure.md).
368-
- [Docker socket mount restrictions](hardened-desktop/enhanced-container-isolation/config.md) with ECI is now generally available.
367+
- You can now enforce Rosetta usage via [Settings Management](/security/for-admins/hardened-desktop/settings-management/configure.md).
368+
- [Docker socket mount restrictions](/security/for-admins/hardened-desktop/enhanced-container-isolation/config.md) with ECI is now generally available.
369369
- Docker Engine and CLI updated to [Moby 26.0](https://github.com/moby/moby/releases/tag/v26.0.0). This includes Buildkit 0.13, sub volumes mounts, networking updates, and improvements to the containerd multi-platform image store UX.
370370
- New and improved Docker Desktop error screens: swift troubleshooting, easy diagnostics uploads, and actionable remediation.
371371
- Compose supports [Synchronized file shares (experimental)](synchronized-file-sharing.md).
372372
- New [interactive Compose CLI (experimental)](../compose/environment-variables/envvars.md#compose_menu).
373373
- Beta release of:
374-
- Air-Gapped Containers with [Settings Management](hardened-desktop/air-gapped-containers/_index.md).
374+
- Air-Gapped Containers with [Settings Management](/security/for-admins/hardened-desktop/air-gapped-containers/_index.md).
375375
- [Host networking](/engine/network/drivers/host.md#docker-desktop) in Docker Desktop.
376376
- [Docker Debug](use-desktop/container.md#integrated-terminal) for running containers.
377377
- [Volumes Backup & Share extension](use-desktop/volumes.md) functionality available in the **Volumes** tab.
@@ -444,7 +444,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
444444

445445
### New
446446

447-
- [Settings Management](hardened-desktop/settings-management/index.md) now allows admins to set the default file-sharing implementation and specify which paths developer can add file shares to.
447+
- [Settings Management](/security/for-admins/hardened-desktop/settings-management/index.md) now allows admins to set the default file-sharing implementation and specify which paths developer can add file shares to.
448448
- Added support for `socks5://` HTTP and HTTPS proxy URLs when the [`SOCKS` proxy support beta feature](networking.md) is enabled.
449449
- Users can now filter volumes to see which ones are in use in the **Volumes** tab.
450450

@@ -569,7 +569,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
569569

570570
- Docker init now supports Java and is generally available to all users.
571571
- [Synchronized File Shares](synchronized-file-sharing.md) provides fast and flexible host-to-VM file sharing within Docker Desktop. Utilizing the technology behind [Docker’s acquisition of Mutagen](https://www.docker.com/blog/mutagen-acquisition/), this feature provides an alternative to virtual bind mounts that uses synchronized filesystem caches, improving performance for developers working with large codebases.
572-
- Organization admins can now [configure Docker socket mount permissions](hardened-desktop/enhanced-container-isolation/config.md) when ECI is enabled.
572+
- Organization admins can now [configure Docker socket mount permissions](/security/for-admins/hardened-desktop/enhanced-container-isolation/config.md) when ECI is enabled.
573573
- [Containerd Image Store](containerd.md) support is now generally available to all users.
574574
- Get a debug shell into any container or image with the new [`docker debug` command](../reference/cli/docker/debug.md) (Beta).
575575
- Organization admins, with a Docker Business subscription, can now configure a custom list of extensions with [Private Extensions Marketplace](extensions/private-marketplace.md) enabled (Beta)
@@ -674,7 +674,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
674674

675675
### New
676676

677-
- Administrators can now control access to beta and experimental features in the **Features in development** tab with [Settings Management](hardened-desktop/settings-management/configure.md).
677+
- Administrators can now control access to beta and experimental features in the **Features in development** tab with [Settings Management](/security/for-admins/hardened-desktop/settings-management/configure.md).
678678
- Introduced four new version update states in the footer.
679679
- `docker init` (Beta) now supports PHP with Apache + Composer.
680680
- The [**Builds** view](use-desktop/builds.md) is now GA. You can now inspect builds, troubleshoot errors, and optimize build speed.
@@ -790,7 +790,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
790790
- Rosetta is now Generally Available for all users on macOS 13 or later. It provides faster emulation of Intel-based images on Apple Silicon. To use Rosetta, see [Settings](settings/mac.md). Rosetta is enabled by default on macOS 14.1 and later.
791791
- Docker Desktop now detects if a WSL version is out of date. If an out dated version of WSL is detected, you can allow Docker Desktop to automatically update the installation or you can manually update WSL outside of Docker Desktop.
792792
- New installations of Docker Desktop for Windows now require a Windows version of 19044 or later.
793-
- Administrators now have the ability to control Docker Scout image analysis in [Settings Management](hardened-desktop/settings-management/configure.md).
793+
- Administrators now have the ability to control Docker Scout image analysis in [Settings Management](/security/for-admins/hardened-desktop/settings-management/configure.md).
794794

795795
### Upgrades
796796

@@ -1057,7 +1057,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
10571057

10581058
#### For all platforms
10591059

1060-
- [Settings Management](hardened-desktop/settings-management/index.md) now lets you turn off Docker Extensions for your organisation.
1060+
- [Settings Management](/security/for-admins/hardened-desktop/settings-management/index.md) now lets you turn off Docker Extensions for your organisation.
10611061
- Fixed a bug where turning on Kubernetes from the UI failed when the system was paused.
10621062
- Fixed a bug where turning on Wasm from the UI failed when the system was paused.
10631063
- Bind mounts are now shown when you [inspect a container](use-desktop/container.md).
@@ -1689,7 +1689,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
16891689

16901690
### New
16911691

1692-
- Two new security features have been introduced for Docker Business users, Settings Management and Enhanced Container Isolation. Read more about Docker Desktop’s new [Hardened Docker Desktop security model](hardened-desktop/index.md).
1692+
- Two new security features have been introduced for Docker Business users, Settings Management and Enhanced Container Isolation. Read more about Docker Desktop’s new [Hardened Docker Desktop security model](/security/for-admins/hardened-desktop/index.md).
16931693
- Added the new Dev Environments CLI `docker dev`, so you can create, list, and run Dev Envs via command line. Now it's easier to integrate Dev Envs into custom scripts.
16941694
- Docker Desktop can now be installed to any drive and folder using the `--installation-dir`. Partially addresses [docker/roadmap#94](https://github.com/docker/roadmap/issues/94).
16951695

0 commit comments

Comments
 (0)