Skip to content

Commit 936fad5

Browse files
ENGDOCS-2515 (#22347)
<!--Delete sections as needed --> ## Description Freshness to DD setup section. The odd new sentence here and there, but mostly efficiency gains and tidying ## Related issues or tickets <!-- Related issues, pull requests, or Jira tickets --> ## Reviews <!-- Notes for reviewers here --> <!-- List applicable reviews (optionally @tag reviewers) --> - [ ] Technical review - [ ] Editorial review - [ ] Product review --------- Co-authored-by: Sarah Sanders <[email protected]>
1 parent 72cd41d commit 936fad5

File tree

19 files changed

+224
-287
lines changed

19 files changed

+224
-287
lines changed

_vale/Docker/Acronyms.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ exceptions:
5050
- GDB
5151
- GET
5252
- GHSA
53+
- GNOME
5354
- GNU
5455
- GPG
5556
- GPL
@@ -74,10 +75,12 @@ exceptions:
7475
- JIT
7576
- JSON
7677
- JSX
78+
- KDE
7779
- LESS
7880
- LLDB
7981
- LTS
8082
- MAC
83+
- MATE
8184
- MCP
8285
- mcp
8386
- MDM

content/manuals/desktop/_index.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ grid:
1515
[Windows](/desktop/setup/install/windows-install/), or
1616
[Linux](/desktop/setup/install/linux/).
1717
icon: download
18-
- title: Explore Docker Desktop
19-
description: Navigate Docker Desktop and learn about its key features.
18+
- title: Learn about Docker Desktop
19+
description: Navigate Docker Desktop.
2020
icon: feature_search
2121
link: /desktop/use-desktop/
22+
- title: Explore its key features
23+
description: |
24+
Find information about [Docker VMM](/desktop/features/vmm/), [WSL](/desktop/features/wsl/), [deploying on Kubernetes](/desktop/features/kubernetes/), and more.
25+
icon: category
2226
- title: View the release notes
2327
description: Find out about new features, improvements, and bug fixes.
2428
icon: note_add
@@ -27,11 +31,6 @@ grid:
2731
description: Explore general FAQs or FAQs for specific platforms.
2832
icon: help
2933
link: /desktop/troubleshoot-and-support/faqs/general/
30-
- title: Find additional resources
31-
description: |
32-
Find information on networking features, deploying on Kubernetes, and more.
33-
icon: category
34-
link: /desktop/features/kubernetes/
3534
- title: Give feedback
3635
description: Provide feedback on Docker Desktop or Docker Desktop features.
3736
icon: sms
@@ -51,15 +50,18 @@ It provides a straightforward GUI (Graphical User Interface) that lets you manag
5150

5251
Docker Desktop reduces the time spent on complex setups so you can focus on writing code. It takes care of port mappings, file system concerns, and other default settings, and is regularly updated with bug fixes and security updates.
5352

53+
Docker Desktop integrates with your preferred development tools and languages, and gives you access to a vast ecosystem of trusted images and templates via Docker Hub. This empowers teams to accelerate development, automate builds, enable CI/CD workflows, and collaborate securely through shared repositories.
54+
5455
{{< tabs >}}
5556
{{< tab name="What's included in Docker Desktop?" >}}
5657

5758
- [Docker Engine](/manuals/engine/_index.md)
5859
- Docker CLI client
59-
- [Docker Scout](../scout/_index.md) (additional subscription may apply)
60+
- [Docker Scout](../scout/_index.md)
6061
- [Docker Build](/manuals/build/_index.md)
61-
- [Docker Extensions](../extensions/_index.md)
6262
- [Docker Compose](/manuals/compose/_index.md)
63+
- [Ask Gordon](/manuals/desktop/features/gordon/_index.md)
64+
- [Docker Extensions](../extensions/_index.md)
6365
- [Docker Content Trust](/manuals/engine/security/trust/_index.md)
6466
- [Kubernetes](https://github.com/kubernetes/kubernetes/)
6567
- [Credential Helper](https://github.com/docker/docker-credential-helpers/)
@@ -78,10 +80,4 @@ Docker Desktop reduces the time spent on complex setups so you can focus on writ
7880
{{< /tab >}}
7981
{{< /tabs >}}
8082

81-
Docker Desktop works with your choice of development tools and languages and
82-
gives you access to a vast library of certified images and templates in
83-
[Docker Hub](https://hub.docker.com/). This allows development teams to extend
84-
their environment to rapidly auto-build, continuously integrate, and collaborate
85-
using a secure repository.
86-
8783
{{< grid >}}

content/manuals/desktop/setup/install/enterprise-deployment/faq.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: Enterprise deployment FAQs
3+
linkTitle: FAQs
34
description: Frequently asked questions for deploying Docker Desktop at scale
45
keywords: msi, deploy, docker desktop, faqs, pkg, mdm, jamf, intune, windows, mac, enterprise, admin
56
tags: [FAQ, admin]
@@ -10,23 +11,27 @@ aliases:
1011

1112
## MSI
1213

14+
Common questions about installing Docker Desktop using the MSI installer.
15+
1316
### What happens to user data if they have an older Docker Desktop installation (i.e. `.exe`)?
1417

15-
If they have an older `.exe` installation, users must [uninstall](/manuals/desktop/uninstall.md) this version before using the new MSI version. This deletes all Docker containers, images, volumes, and other Docker-related data local to the machine, and removes the files generated by the application. For older versions, users should [backup](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) any containers that they want to keep.
18+
Users must [uninstall](/manuals/desktop/uninstall.md) older `.exe` installations before using the new MSI version. This deletes all Docker containers, images, volumes, and other Docker-related data local to the machine, and removes the files generated by Docker Desktop.
19+
20+
To preserve existing data before uninstalling, users should [backup](/manuals/desktop/settings-and-maintenance/backup-and-restore.md) their containers and volumes.
1621

17-
For Docker Desktop versions 4.30 and later of the `exe` installer, a `-keep-data` flag is available. It removes Docker Desktop but keeps underlying data, such as the VMs that run containers.
22+
For Docker Desktop 4.30 and later, the `.exe` installer includes a `-keep-data` flag that removes Docker Desktop while preserving underlying resources such as the container VMs:
1823

1924
```powershell
2025
& 'C:\Program Files\Docker\Docker\Docker Desktop Installer.exe' uninstall -keep-data
2126
```
2227

2328
### What happens if the user's machine has an older `.exe` installation?
2429

25-
The new MSI installer checks if a previous version was installed and doesn't proceed with the installation. Instead, it prompts the user to uninstall their current/old version first, before retrying to install the MSI version.
30+
The MSI installer detects older `.exe` installations and blocks the installation until the previous version is uninstalled. It prompts the user to uninstall their current/old version first, before retrying to install the MSI version.
2631

2732
### My installation failed, how do I find out what happened?
2833

29-
MSI installations can sometimes fail unexpectedly and not provide users with much information about what went wrong.
34+
MSI installations may fail silently, offering little diagnostic feedback.
3035

3136
To debug a failed installation, run the install again with verbose logging enabled:
3237

content/manuals/desktop/setup/install/enterprise-deployment/msi-install-and-configure.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use the MSI installer
2+
title: MSI installer
33
description: Understand how to use the MSI installer. Also explore additional configuration options.
44
keywords: msi, windows, docker desktop, install, deploy, configure, admin, mdm
55
tags: [admin]
@@ -21,7 +21,7 @@ The MSI package supports various MDM (Mobile Device Management) solutions, makin
2121
2. Under **Docker Desktop**, select the **Deploy** page.
2222
3. From the **Windows OS** tab, select the **Download MSI installer** button.
2323
4. Once downloaded, double-click `Docker Desktop Installer.msi` to run the installer.
24-
5. Once you've accepted the license agreement, you can choose the install location. By default, Docker Desktop is installed at `C:\Program Files\Docker\Docker`.
24+
5. After accepting the license agreement, choose the install location. By default, Docker Desktop is installed at `C:\Program Files\Docker\Docker`.
2525
6. Configure the Docker Desktop installation. You can:
2626

2727
- Create a desktop shortcut
@@ -30,19 +30,19 @@ The MSI package supports various MDM (Mobile Device Management) solutions, makin
3030

3131
- Disable Windows Container usage
3232

33-
- Select the engine for Docker Desktop. Either WSL or Hyper-V. If your system only supports one of the two options, you won't be able to select which backend to use.
33+
- Select the Docker Desktop backend: WSL or Hyper-V. If only one is supported by your system, you won't be able to choose.
3434
7. Follow the instructions on the installation wizard to authorize the installer and proceed with the install.
3535
8. When the installation is successful, select **Finish** to complete the installation process.
3636

37-
If your administrator account is different to your user account, you must add the user to the **docker-users** group:
37+
If your administrator account is different from your user account, you must add the user to the **docker-users** group:
3838
1. Run **Computer Management** as an **administrator**.
3939
2. Navigate to **Local Users and Groups** > **Groups** > **docker-users**.
4040
3. Right-click to add the user to the group.
4141
4. Sign out and sign back in for the changes to take effect.
4242

4343
> [!NOTE]
4444
>
45-
> When installing Docker Desktop with the MSI, in-app updates are automatically disabled. This feature ensures your organization maintains the required Docker Desktop version. For Docker Desktop installed with the .exe installer, in-app updates remain supported.
45+
> When installing Docker Desktop with the MSI, in-app updates are automatically disabled. This ensures organizations can maintain version consistency and prevent unapproved updates. For Docker Desktop installed with the .exe installer, in-app updates remain supported.
4646
>
4747
> Docker Desktop notifies you when an update is available. To update Docker Desktop, download the latest installer from the Docker Admin Console. Navigate to the **Deploy** page > under **Docker Desktop**.
4848
>
@@ -116,7 +116,7 @@ msiexec /i "DockerDesktop.msi" /L*V ".\msi.log" /passive /norestart
116116

117117
> [!TIP]
118118
>
119-
> Some useful tips to remember when creating a value that expects a JSON string as it’s value:
119+
> When creating a value that expects a JSON string:
120120
>
121121
> - The property expects a JSON formatted string
122122
> - The string should be wrapped in double quotes
@@ -142,7 +142,7 @@ IdentifyingNumber Name
142142
```
143143
> [!NOTE]
144144
>
145-
> This command can take some time to return, depending on the number of installed applications.
145+
> This command may take some time, depending on the number of installed applications.
146146
147147
`IdentifyingNumber` is the applications product code and can be used to uninstall Docker Desktop. For example:
148148

@@ -202,11 +202,11 @@ msiexec /x "DockerDesktop.msi" /quiet
202202

203203
Additionally, you can also use `/norestart` or `/forcerestart` to control reboot behaviour.
204204

205-
By default, the installer reboots the machine after a successful installation. When ran silently, the reboot is automatic and the user is not prompted.
205+
By default, the installer reboots the machine after a successful installation. When run silently, the reboot is automatic and the user is not prompted.
206206

207207
## Analytics
208208

209-
The MSI installer collects anonymous usage statistics relating to install only. This is to better understand user behaviour and to improve the user experience by identifying and addressing issues or optimizing popular features.
209+
The MSI installer collects anonymous usage statistics relating to installation only. This is to better understand user behaviour and to improve the user experience by identifying and addressing issues or optimizing popular features.
210210

211211
### How to opt-out
212212

@@ -239,7 +239,7 @@ The registry key is as follows:
239239
SOFTWARE\Docker Inc.\Docker Desktop\DisableMsiAnalytics
240240
```
241241

242-
When analytics is disabled, this key has a value of `1`.
242+
When analytics is disabled, this key is set to `1`.
243243

244244
## Additional resources
245245

content/manuals/desktop/setup/install/enterprise-deployment/pkg-install-and-configure.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use the PKG installer
2+
title: PKG installer
33
description: Understand how to use the PKG installer. Also explore additional configuration options.
44
keywords: pkg, mac, docker desktop, install, deploy, configure, admin, mdm
55
tags: [admin]
@@ -16,17 +16,17 @@ The PKG package supports various MDM (Mobile Device Management) solutions, makin
1616
2. Under **Docker Desktop**, select the **Deploy** page.
1717
3. From the **macOS** tab, select the **Download PKG installer** button.
1818
4. Once downloaded, double-click `Docker.pkg` to run the installer.
19-
5. Follow the instructions on the installation wizard to authorize the installer and proceed with the install.
20-
- **Introduction**: Select `Continue`.
21-
- **License**: Review the license agreement and select `Agree`.
22-
- **Destination Select**: This step is optional. It is recommended that you don't change the default installation destination (usually `Macintosh HD`). Select `Continue`.
23-
- **Installation Type**: Select `Install`.
19+
5. Follow the instructions on the installation wizard to authorize the installer and proceed with the installation.
20+
- **Introduction**: Select **Continue**.
21+
- **License**: Review the license agreement and select **Agree**.
22+
- **Destination Select**: This step is optional. It is recommended that you keep the default installation destination (usually `Macintosh HD`). Select **Continue**.
23+
- **Installation Type**: Select **Install**.
2424
- **Installation**: Authenticate using your administrator password or Touch ID.
25-
- **Summary**: After the installation completes, select `Close`.
25+
- **Summary**: When the installation completes, select **Close**.
2626

2727
> [!NOTE]
2828
>
29-
> When installing Docker Desktop with the PKG, in-app updates are automatically disabled. This feature ensures your organization maintains the required Docker Desktop version. For Docker Desktop installed with the .dmg installer, in-app updates remain supported.
29+
> When installing Docker Desktop with the PKG, in-app updates are automatically disabled. This ensures organizations can maintain version consistency and prevent unapproved updates. For Docker Desktop installed with the `.dmg` installer, in-app updates remain supported.
3030
>
3131
> Docker Desktop notifies you when an update is available. To update Docker Desktop, download the latest installer from the Docker Admin Console. Navigate to the **Deploy** page > under **Docker Desktop**.
3232
>
@@ -45,5 +45,5 @@ The PKG package supports various MDM (Mobile Device Management) solutions, makin
4545

4646
## Additional resources
4747

48-
- See how you can deploy Docker Desktop for Mac via [Intune](use-intune.md) or [Jamf Pro](use-jamf-pro.md)
48+
- See how you can deploy Docker Desktop for Mac using [Intune](use-intune.md) or [Jamf Pro](use-jamf-pro.md)
4949
- Explore how to [Enforce sign-in](/manuals/security/for-admins/enforce-sign-in/methods.md#plist-method-mac-only) for your users.

content/manuals/desktop/setup/install/enterprise-deployment/use-intune.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use Intune
2+
title: Deploy with Intune
33
description: Use Intune, Microsoft's cloud-based device management tool, to deploy Docker Desktop
44
keywords: microsoft, windows, docker desktop, deploy, mdm, enterprise, administrator, mac, pkg, dmg
55
tags: [admin]
@@ -11,7 +11,7 @@ aliases:
1111

1212
{{< summary-bar feature_name="Intune" >}}
1313

14-
Learn how to deploy Docker Desktop for Windows and Mac using Intune, Microsoft's cloud-based device management tool.
14+
Learn how to deploy Docker Desktop on Windows and macOS devices using Microsoft Intune. It covers app creation, installer configuration, and assignment to users or devices.
1515

1616
{{< tabs >}}
1717
{{< tab name="Windows" >}}
@@ -20,7 +20,7 @@ Learn how to deploy Docker Desktop for Windows and Mac using Intune, Microsoft's
2020
2. Add a new app. Select **Apps**, then **Windows**, then **Add**.
2121
3. For the app type, select **Windows app (Win32)**
2222
4. Select the `intunewin` package.
23-
5. Complete any relevant details such as the description, publisher, or app version and then select **Next**.
23+
5. Fill in the required details, such as the description, publisher, or app version and then select **Next**.
2424
6. Optional: On the **Program** tab, you can update the **Install command** field to suit your needs. The field is pre-populated with `msiexec /i "DockerDesktop.msi" /qn`. See the [Common installation scenarios](msi-install-and-configure.md) for examples on the changes you can make.
2525

2626
> [!TIP]
@@ -29,17 +29,17 @@ Learn how to deploy Docker Desktop for Windows and Mac using Intune, Microsoft's
2929
>
3030
> This is because the Docker Desktop installer installs Windows features depending on your engine selection and also updates the membership of the `docker-users` local group.
3131
>
32-
> You may also want to set Intune to determine behaviour based on return codes and watch for a return code of `3010`.
32+
> You may also want to set Intune to determine behaviour based on return codes and watch for a return code of `3010`. Return code 3010 means the installation succeeded but a reboot is required.
3333
34-
7. Complete the rest of the tabs and then review and create the app.
34+
7. Complete the remaining tabs, then review and create the app.
3535

3636
{{< /tab >}}
3737
{{< tab name="Mac" >}}
3838

3939
First, upload the package:
4040

4141
1. Sign in to your Intune admin center.
42-
2. Add a new app. Select **Apps**, then **macOSs**, then **Add**.
42+
2. Add a new app. Select **Apps**, then **macOS**, then **Add**.
4343
3. Select **Line-of-business app** and then **Select**.
4444
4. Upload the `Docker.pkg` file and fill in the required details.
4545

@@ -55,4 +55,4 @@ Next, assign the app:
5555
## Additional resources
5656

5757
- [Explore the FAQs](faq.md).
58-
- Learn how to [Enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) for your users.
58+
- Learn how to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) for your users.
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
---
2-
title: Use Jamf Pro
3-
description: Use Jamf Pro to deploy Docker Desktop
2+
title: Deploy with Jamf Pro
3+
description: Use Jamf Pro to deploy Docker Desktop for Mac
44
keywords: jamf, mac, docker desktop, deploy, mdm, enterprise, administrator, pkg
55
tags: [admin]
66
weight: 40
77
---
88

99
{{< summary-bar feature_name="Jamf Pro" >}}
1010

11-
Learn how to deploy Docker Desktop for Mac using Jamf Pro.
11+
Learn how to deploy Docker Desktop for Mac using Jamf Pro, including uploading the installer and creating a deployment policy.
1212

1313
First, upload the package:
1414

15-
1. From the Jamf pro console, Navigate to **Computers** > **Management Settings** > **Computer Management** > **Packages**.
15+
1. From the Jamf Pro console, navigate to **Computers** > **Management Settings** > **Computer Management** > **Packages**.
1616
2. Select **New** to add a new package.
1717
3. Upload the `Docker.pkg` file.
1818

1919
Next, create a policy for deployment:
2020

2121
1. Navigate to **Computers** > **Policies**.
22-
2. Select **New**to create a new policy.
22+
2. Select **New** to create a new policy.
2323
3. Enter a name for the policy, for example "Deploy Docker Desktop".
2424
4. Under the **Packages** tab, add the Docker package you uploaded.
25-
5. Configure the scope to target the devices or device groups you want to install Docker on.
25+
5. Configure the scope to target the devices or device groups on which you want to install Docker.
2626
6. Save the policy and deploy.
2727

2828
For more information, see [Jamf Pro's official documentation](https://learn.jamf.com/en-US/bundle/jamf-pro-documentation-current/page/Policies.html).
2929

3030
## Additional resources
3131

32-
- Learn how to [Enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) for your users.
32+
- Learn how to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) for your users.

0 commit comments

Comments
 (0)