mirror of https://github.com/docker/docs.git
Fix review comments
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
This commit is contained in:
Usha Mandya
parent
3961569a73
commit
e285243514
|
|
@ -8,13 +8,13 @@ redirect_from:
|
|||
- /docker-for-mac/apple-m1/
|
||||
---
|
||||
|
||||
Welcome to Docker Desktop for Apple Silicon.
|
||||
Welcome to Docker Desktop for Apple silicon.
|
||||
|
||||
## Docker Desktop 3.3.1
|
||||
|
||||
2021-04-15
|
||||
|
||||
Click the following link to download the GA version of Docker Desktop for Apple silicon.
|
||||
Click on the following link to download the GA version of Docker Desktop for Apple silicon.
|
||||
|
||||
> [Download](https://desktop.docker.com/mac/stable/arm64/Docker.dmg)
|
||||
|
||||
|
|
@ -22,10 +22,11 @@ Click the following link to download the GA version of Docker Desktop for Apple
|
|||
|
||||
You must install **Rosetta 2** as some binaries are still Darwin/AMD64. To install Rosetta 2 manually from the command line, run the following command:
|
||||
|
||||
```
|
||||
softwareupdate --install-rosetta
|
||||
```
|
||||
We expect to fix this in a future release.
|
||||
```
|
||||
softwareupdate --install-rosetta
|
||||
```
|
||||
|
||||
We expect to fix this in a future release.
|
||||
|
||||
### Known issues
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,13 @@ By downloading Docker Desktop, you agree to the terms of the [Docker Software En
|
|||
|
||||
Your Mac must meet the following requirements to successfully install Docker Desktop.
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a data-toggle="tab" data-target="#mac-intel">Mac with Intel chip</a></li>
|
||||
<li><a data-toggle="tab" data-target="#mac-apple-silicon">Mac with Apple silicon</a></li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div id="mac-intel" class="tab-pane fade in active" markdown="1">
|
||||
|
||||
### Mac with Intel chip
|
||||
|
||||
- **macOS must be version 10.14 or newer**. That is, Mojave, Catalina, or Big Sur. We recommend upgrading to the latest version of macOS.
|
||||
|
|
@ -32,6 +39,9 @@ Your Mac must meet the following requirements to successfully install Docker Des
|
|||
|
||||
- VirtualBox prior to version 4.3.30 must not be installed as it is not compatible with Docker Desktop.
|
||||
|
||||
</div>
|
||||
<div id="mac-apple-silicon" class="tab-pane fade" markdown="1">
|
||||
|
||||
### Mac with Apple silicon
|
||||
|
||||
- You must install **Rosetta 2** as some binaries are still Darwin/AMD64. To install Rosetta 2 manually from the command line, run the following command:
|
||||
|
|
@ -42,6 +52,9 @@ Your Mac must meet the following requirements to successfully install Docker Des
|
|||
|
||||
For more information, see [Docker Desktop for Apple silicon](apple-silicon.md).
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
## What's included in the installer
|
||||
|
||||
The Docker Desktop installation includes
|
||||
|
|
@ -102,7 +115,7 @@ To uninstall Docker Desktop from your Mac:
|
|||
## Where to go next
|
||||
|
||||
- [Getting started](index.md) provides an overview of Docker Desktop on Mac, basic Docker command examples, how to get help or give feedback, and links to other topics about Docker Desktop on Mac.
|
||||
- [Docker Desktop for Apple silicon](apple-silicon.md)for detailed information about Docker Desktop for Apple silicon.
|
||||
- [Docker Desktop for Apple silicon](apple-silicon.md) for detailed information about Docker Desktop for Apple silicon.
|
||||
- [Troubleshooting](troubleshoot.md) describes common problems, workarounds, how
|
||||
to run and submit diagnostics, and submit issues.
|
||||
- [FAQs](../desktop/faqs.md) provide answers to frequently asked questions.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
### New
|
||||
|
||||
Docker Desktop for Mac on Apple silicon is now available a GA release. For more information, see [Docker Desktop for Apple silicon](apple-silicon.md).
|
||||
Docker Desktop for Mac on Apple silicon is now available as a GA release. For more information, see [Docker Desktop for Apple silicon](apple-silicon.md).
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
|
|
|||
|
|
@ -17,20 +17,12 @@ By downloading Docker Desktop, you agree to the terms of the [Docker Software En
|
|||
|
||||
Your Windows machine must meet the following requirements to successfully install Docker Desktop.
|
||||
|
||||
### Hyper-V backend and Windows containers
|
||||
|
||||
- Windows 10 64-bit: Pro, Enterprise, or Education (Build 17134 or higher).
|
||||
|
||||
For Windows 10 Home, see [System requirements for WSL 2 backend](#system-requirements-for-wsl-2-backend).
|
||||
- Hyper-V and Containers Windows features must be enabled.
|
||||
- The following hardware prerequisites are required to successfully run Client
|
||||
Hyper-V on Windows 10:
|
||||
|
||||
- 64 bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation){: target="_blank" rel="noopener" class="_"}
|
||||
- 4GB system RAM
|
||||
- BIOS-level hardware virtualization support must be enabled in the
|
||||
BIOS settings. For more information, see
|
||||
[Virtualization](troubleshoot.md#virtualization-must-be-enabled).
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a data-toggle="tab" data-target="#win-wsl2">WSL 2 backend</a></li>
|
||||
<li><a data-toggle="tab" data-target="#win-hyper-v">Hyper-V backend and Windows containers</a></li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div id="win-wsl2" class="tab-pane fade in active" markdown="1">
|
||||
|
||||
### WSL 2 backend
|
||||
|
||||
|
|
@ -47,6 +39,27 @@ WSL 2 on Windows 10:
|
|||
[Virtualization](troubleshoot.md#virtualization-must-be-enabled).
|
||||
- Download and install the [Linux kernel update package](https://docs.microsoft.com/windows/wsl/wsl2-kernel){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
</div>
|
||||
<div id="win-hyper-v" class="tab-pane fade" markdown="1">
|
||||
|
||||
### Hyper-V backend and Windows containers
|
||||
|
||||
- Windows 10 64-bit: Pro, Enterprise, or Education (Build 17134 or higher).
|
||||
|
||||
For Windows 10 Home, see [System requirements for WSL 2 backend](#system-requirements-for-wsl-2-backend).
|
||||
- Hyper-V and Containers Windows features must be enabled.
|
||||
- The following hardware prerequisites are required to successfully run Client
|
||||
Hyper-V on Windows 10:
|
||||
|
||||
- 64 bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation){: target="_blank" rel="noopener" class="_"}
|
||||
- 4GB system RAM
|
||||
- BIOS-level hardware virtualization support must be enabled in the
|
||||
BIOS settings. For more information, see
|
||||
[Virtualization](troubleshoot.md#virtualization-must-be-enabled).
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
> **Note**
|
||||
>
|
||||
> Docker supports Docker Desktop on Windows for those versions of Windows 10 that are still within [Microsoft’s servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet){:target="_blank" rel="noopener" class="_"}.
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
title: How to run Docker Desktop on new Mac with Apple Silicon processors
|
||||
description: Instructions on enabling BuildKit
|
||||
keywords: mac, troubleshooting, apple, silicon, issues
|
||||
redirect_to: /docker-for-mac/apple-m1/
|
||||
redirect_to: /docker-for-mac/apple-silicon/
|
||||
---
|
||||
|
|
|
|||
Loading…
Reference in New Issue