Skip to content

Commit 8471ec5

Browse files
committed
more edits
1 parent 9696b38 commit 8471ec5

File tree

7 files changed

+43
-61
lines changed

7 files changed

+43
-61
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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,4 @@ Docker Desktop integrates with your preferred development tools and languages, a
8080
{{< /tab >}}
8181
{{< /tabs >}}
8282

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The PKG package supports various MDM (Mobile Device Management) solutions, makin
2626

2727
> [!NOTE]
2828
>
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.
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
>

content/manuals/desktop/setup/install/linux/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ To install Docker Desktop successfully, your Linux host must meet the following
137137
- KVM virtualization support. Follow the [KVM virtualization support instructions](#kvm-virtualization-support) to check if the KVM kernel modules are enabled and how to provide access to the KVM device.
138138
- QEMU must be version 5.2 or later. We recommend upgrading to the latest version.
139139
- systemd init system.
140-
- GNOW, KDE, or MATE desktop environment.
140+
- GNOME, KDE, or MATE desktop environment.
141141
- For many Linux distributions, the GNOME environment does not support tray icons. To add support for tray icons, you need to install a GNOME extension. For example, [AppIndicator](https://extensions.gnome.org/extension/615/appindicator-support/).
142142
- At least 4 GB of RAM.
143143
- Enable configuring ID mapping in user namespaces, see [File sharing](/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md#how-do-i-enable-file-sharing). Note that for Docker Desktop version 4.35 and later, this is not required anymore.

content/manuals/desktop/setup/install/linux/rhel.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ keywords: red hat, red hat enterprise linux, rhel, rpm,
66
title: Install Docker Desktop on RHEL
77
linkTitle: RHEL
88
download-url-base: https://download.docker.com/linux/rhel
9-
params:
10-
sidebar:
11-
badge:
12-
color: green
13-
text: New
149
aliases:
1510
- /desktop/install/linux/rhel/
1611
---

content/manuals/desktop/setup/sign-in.md

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ aliases:
3030
- /desktop/get-started/
3131
---
3232

33-
Docker recommends that you authenticate using the **Sign in** option in the top-right corner of the Docker Dashboard.
33+
Docker recommends signing in with the **Sign in** option in the top-right corner of the Docker Dashboard.
3434

3535
In large enterprises where admin access is restricted, administrators can [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md).
3636

@@ -40,61 +40,53 @@ In large enterprises where admin access is restricted, administrators can [enfor
4040
4141
## Benefits of signing in
4242

43-
- You can access your Docker Hub repositories directly from Docker Desktop.
43+
- Access your Docker Hub repositories directly from Docker Desktop.
4444

45-
- Authenticated users also get a higher pull rate limit compared to anonymous users. For more information, see [Usage and limits](/manuals/docker-hub/usage/_index.md).
45+
- Increase your pull rate limit compared to anonymous users. See [Usage and limits](/manuals/docker-hub/usage/_index.md).
4646

47-
- Improve your organization’s security posture for containerized development by taking advantage of [Hardened Desktop](/manuals/security/for-admins/hardened-desktop/_index.md).
47+
- Enhance your organization’s security posture for containerized development with [Hardened Desktop](/manuals/security/for-admins/hardened-desktop/_index.md).
4848

4949
> [!NOTE]
5050
>
5151
> Docker Desktop automatically signs you out after 90 days, or after 30 days of inactivity.
5252
5353
## Signing in with Docker Desktop for Linux
5454

55-
Docker Desktop for Linux relies on [`pass`](https://www.passwordstore.org/) to store credentials in gpg2-encrypted files.
55+
Docker Desktop for Linux relies on [`pass`](https://www.passwordstore.org/) to store credentials in GPG-encrypted files.
5656
Before signing in to Docker Desktop with your [Docker ID](/accounts/create-account/), you must initialize `pass`.
57-
Docker Desktop displays a warning if you've not initialized `pass`.
57+
Docker Desktop displays a warning if `pass` is not configured.
5858

59+
1. Generate a GPG key. Run:
5960
You can initialize pass by using a gpg key. To generate a gpg key, run:
6061

61-
``` console
62-
$ gpg --generate-key
63-
```
62+
``` console
63+
$ gpg --generate-key
64+
```
65+
2. Enter your name and email once prompted.
6466

65-
The following is an example similar to what you see once you run the previous command:
67+
Once confirmed, GPG creates a key pair. Look for the `pub` line that contains your GPG ID, for example:
6668

67-
```console {hl_lines=12}
68-
...
69-
GnuPG needs to construct a user ID to identify your key.
69+
```text
70+
...
71+
pubrsa3072 2022-03-31 [SC] [expires: 2024-03-30]
72+
3ABCD1234EF56G78
73+
uid Molly <[email protected]>
74+
```
75+
3.Copy the GPG ID and use it to initialize `pass`
7076

71-
Real name: Molly
72-
Email address: [email protected]
73-
You selected this USER-ID:
74-
77+
```console
78+
$ pass init <your_generated_gpg-id_public_key>
79+
```
7580

76-
Change (N)ame, (E)mail, or (O)kay/(Q)uit? O
77-
...
78-
pubrsa3072 2022-03-31 [SC] [expires: 2024-03-30]
79-
<generated gpg-id public key>
80-
uid Molly <[email protected]>
81-
subrsa3072 2022-03-31 [E] [expires: 2024-03-30]
82-
```
83-
84-
To initialize `pass`, run the following command using the public key generated from the previous command:
85-
86-
```console
87-
$ pass init <your_generated_gpg-id_public_key>
88-
```
89-
The following is an example similar to what you see once you run the previous command:
81+
You should see output similar to:
9082

91-
```console
92-
mkdir: created directory '/home/molly/.password-store/'
93-
Password store initialized for <generated_gpg-id_public_key>
94-
```
83+
```text
84+
mkdir: created directory '/home/molly/.password-store/'
85+
Password store initialized for <generated_gpg-id_public_key>
86+
```
9587

9688
Once you initialize `pass`, you can sign in and pull your private images.
97-
When Docker CLI or Docker Desktop use credentials, a user prompt may pop up for the password you set during the gpg key generation.
89+
When Docker CLI or Docker Desktop use credentials, a user prompt may pop up for the password you set during the GPG key generation.
9890

9991
```console
10092
$ docker pull molly/privateimage
@@ -109,5 +101,5 @@ docker.io/molly/privateimage:latest
109101
## What's next?
110102

111103
- [Explore Docker Desktop](/manuals/desktop/use-desktop/_index.md) and its features.
112-
- Change your Docker Desktop settings
113-
- [Browse common FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md)
104+
- Change your [Docker Desktop settings](/manuals/desktop/settings-and-maintenance/settings.md).
105+
- [Browse common FAQs](/manuals/desktop/troubleshoot-and-support/faqs/general.md).

content/manuals/desktop/setup/vm-vdi.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
description: Instructions on how to enable nested virtualization
33
keywords: nested virtualization, Docker Desktop, windows, VM, VDI environment
44
title: Run Docker Desktop for Windows in a VM or VDI environment
5+
linkTitle: VM or VDI environments
56
aliases:
67
- /desktop/nested-virtualization/
78
- /desktop/vm-vdi/
89
weight: 30
910
---
1011

11-
In general, we recommend running Docker Desktop natively on either Mac, Linux, or Windows. However, Docker Desktop for Windows can run inside a virtual desktop provided the virtual desktop is properly configured.
12+
Docker recommends running Docker Desktop natively on Mac, Linux, or Windows. However, Docker Desktop for Windows can run inside a virtual desktop provided the virtual desktop is properly configured.
1213

1314
To run Docker Desktop in a virtual desktop environment, it is essential nested virtualization is enabled on the virtual machine that provides the virtual desktop. This is because, under the hood, Docker Desktop is using a Linux VM in which it runs Docker Engine and the containers.
1415

@@ -18,28 +19,27 @@ To run Docker Desktop in a virtual desktop environment, it is essential nested v
1819
>
1920
> Support for running Docker Desktop on a virtual desktop is available to Docker Business customers, on VMware ESXi or Azure VMs only.
2021
21-
The support available from Docker extends to installing and running Docker Desktop inside the VM, once the nested virtualization is set up correctly. The only hypervisors we have successfully tested are VMware ESXi and Azure, and there is no support for other VMs. For more information on Docker Desktop support, see [Get support](/manuals/desktop/troubleshoot-and-support/support.md).
22+
Docker support includes installing and running Docker Desktop within the VM, provided that nested virtualization is correctly enabled. The only hypervisors successfully tested are VMware ESXi and Azure, and there is no support for other VMs. For more information on Docker Desktop support, see [Get support](/manuals/desktop/troubleshoot-and-support/support.md).
2223

23-
For troubleshooting problems and intermittent failures that are outside of Docker's control, you should contact your hypervisor vendor. Each hypervisor vendor offers different levels of support. For example, Microsoft supports running nested Hyper-V both on-prem and on Azure, with some version constraints. This may not be the case for VMWare ESXi.
24+
For troubleshooting problems and intermittent failures that are outside of Docker's control, you should contact your hypervisor vendor. Each hypervisor vendor offers different levels of support. For example, Microsoft supports running nested Hyper-V both on-prem and on Azure, with some version constraints. This may not be the case for VMware ESXi.
2425

25-
Docker does not support running multiples instances of Docker Desktop on the same machine in a VM or VDI environment.
26+
Docker does not support running multiple instances of Docker Desktop on the same machine in a VM or VDI environment.
2627

2728
## Turn on nested virtualization
2829

2930
You must turn on nested virtualization before you install Docker Desktop on a virtual machine.
3031

3132
### Turn on nested virtualization on VMware ESXi
3233

33-
Nested virtualization of other hypervisors like Hyper-V inside a vSphere VM [is not a supported scenario](https://kb.vmware.com/s/article/2009916). However, running Hyper-V VM in a VMware ESXi VM is technically possible and, depending on the version, ESXi includes hardware-assisted virtualization as a supported feature. For internal testing, we used a VM that had 1 CPU with 4 cores and 12GB of memory.
34+
Nested virtualization of other hypervisors like Hyper-V inside a vSphere VM [is not a supported scenario](https://kb.vmware.com/s/article/2009916). However, running Hyper-V VM in a VMware ESXi VM is technically possible and, depending on the version, ESXi includes hardware-assisted virtualization as a supported feature. A VM that had 1 CPU with 4 cores and 12GB of memory was used for internal testing.
3435

3536
For steps on how to expose hardware-assisted virtualization to the guest OS, [see VMware's documentation](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-2A98801C-68E8-47AF-99ED-00C63E4857F6.html).
3637

37-
3838
### Turn on nested virtualization on an Azure Virtual Machine
3939

4040
Nested virtualization is supported by Microsoft for running Hyper-V inside an Azure VM.
4141

42-
For Azure virtual machines, [check that the VM size chosen supports nested virtualization](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes). Microsoft provides [a helpful list on Azure VM sizes](https://docs.microsoft.com/en-us/azure/virtual-machines/acu) and highlights the sizes that currently support nested virtualization. For internal testing, we used D4s_v5 machines. We recommend this specification or above for optimal performance of Docker Desktop.
42+
For Azure virtual machines, [check that the VM size chosen supports nested virtualization](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes). Microsoft provides [a helpful list on Azure VM sizes](https://docs.microsoft.com/en-us/azure/virtual-machines/acu) and highlights the sizes that currently support nested virtualization. D4s_v5 machines were used for internal testing. Use this specification or above for optimal performance of Docker Desktop.
4343

4444
## Docker Desktop support on Nutanix-powered VDI
4545

@@ -57,6 +57,4 @@ Docker Desktop follows the VDI support definitions outlined [previously](#virtua
5757

5858
### Support scope and responsibilities
5959

60-
If WSL 2 encounters issues - for example, it crashes, fails to start, or experiences performance degradation - contact Nutanix support.
61-
62-
If Docker Desktop itself encounters issues, contact Docker support.
60+
For WSL 2-related issues, contact Nutanix support. For Docker Desktop-specific issues, contact Docker support.

0 commit comments

Comments
 (0)