Merge pull request #12204 from stephen-turner/ST-2021-01-29

Changes to desktop docs
This commit is contained in:
Usha Mandya 2021-02-02 12:52:35 +00:00 committed by GitHub
commit 7845c58248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions

View File

@ -27,6 +27,7 @@ The tech preview of Docker Desktop for Apple M1 currently has the following limi
- The DNS name `host.docker.internal` only works if you add `--add-host=host.docker.internal:host-gateway` to the `docker run` command
- The DNS name `vm.docker.internal` does not work.
- Kubernetes does not initialize because of a missing DNS name.
- osxfs file sharing does not work.
- The HTTP proxy is not enabled.
- Not all images are available for ARM64. You can add `--platform linux/amd64` to run an Intel image under emulation.

View File

@ -48,9 +48,7 @@ WSL 2 on Windows 10 Home:
> **Note**
>
> Docker supports Docker Desktop on Windows based on Microsofts support lifecycle
> for Windows 10 operating system. For more information, see the
> [Windows lifecycle fact sheet](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet).
> Docker supports Docker Desktop on Windows for those versions of Windows 10 that are still within [Microsofts servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet).
### What's included in the installer

View File

@ -32,7 +32,9 @@ Hyper-V on Windows 10:
BIOS settings. For more information, see
[Virtualization](troubleshoot.md#virtualization-must-be-enabled).
> **Note:** Docker supports Docker Desktop on Windows based on Microsofts support lifecycle for Windows 10 operating system. For more information, see the [Windows lifecycle fact sheet](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet).
> **Note**
>
> Docker supports Docker Desktop on Windows for those versions of Windows 10 that are still within [Microsofts servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet){:target="_blank" rel="noopener" class="_"}.
### What's included in the installer
@ -118,7 +120,9 @@ To uninstall Docker Desktop from your Windows machine:
2. Select **Docker Desktop** from the **Apps & features** list and then select **Uninstall**.
3. Click **Uninstall** to confirm your selection.
> **Note:** Uninstalling Docker Desktop will destroy Docker containers and images local to the machine and remove the files generated by the application.
> **Note**
>
> Uninstalling Docker Desktop will destroy Docker containers and images local to the machine and remove the files generated by the application.
### Save and restore data