From b90bfba3a75aa32a98f4e16990c29576b417b647 Mon Sep 17 00:00:00 2001 From: Dorin Geman Date: Tue, 24 Sep 2024 17:29:56 +0300 Subject: [PATCH 1/3] desktop/settings: Add Docker VMM Signed-off-by: Dorin Geman --- content/manuals/desktop/settings.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/content/manuals/desktop/settings.md b/content/manuals/desktop/settings.md index 4dd41b4c4e82..bb7e1fe90f17 100644 --- a/content/manuals/desktop/settings.md +++ b/content/manuals/desktop/settings.md @@ -59,15 +59,17 @@ If you choose the integrated terminal, you can run commands in a running contain and the ability to run Wasm applications with Docker. For more information, see [containerd image store](containerd.md). -- {{< badge color=blue text="Mac only" >}} **Use Virtualization framework**. Select to allow Docker Desktop to use the `virtualization.framework` instead of the `hypervisor.framework`. +- {{< badge color=blue text="Mac only" >}} **Choose Virtual Machine Manager (VMM)**. Choose the Virtual Machine Monitor for creating and managing the Docker Desktop Linux VM. + - Select **Docker VMM** for the latest and most performant Hypervisor/Virtual Machine Manager. This option is available only on Apple Silicon Macs running macOS 12.5 or later. > [!TIP] > > Turn this setting on to make Docker Desktop run faster. + - Alternatively, you can choose **Apple Virtualization Framework**, **QEMU** (for Apple Silicon), or **Hyperkit** (for Intel Macs). For macOS 12.5 and above, Apple Virtualization Framework is the default setting. - {{< badge color=blue text="Mac only" >}}**Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs (Legacy)**. VirtioFS is only available for macOS versions 12.5 and above, and is turned on by default. - >**Tip** + > [!TIP] > - > Use VirtioFS for speedy file sharing. VirtioFS has reduced the time taken to complete filesystem operations by [up to 98%](https://github.com/docker/roadmap/issues/7#issuecomment-1044452206) + > Use VirtioFS for speedy file sharing. VirtioFS has reduced the time taken to complete filesystem operations by [up to 98%](https://github.com/docker/roadmap/issues/7#issuecomment-1044452206). It is the only file sharing implementation supported by **Docker VMM**. - {{< badge color=blue text="Mac only" >}}**Use Rosetta for x86_64/amd64 emulation on Apple Silicon**. Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have turned on **Virtualization framework** in the **General** settings tab. You must also be on macOS 13 or later. From 9b5e28834cf14ed01ec5763dad8bc87d8fe1cda8 Mon Sep 17 00:00:00 2001 From: Dorin Geman Date: Wed, 25 Sep 2024 11:52:43 +0300 Subject: [PATCH 2/3] desktop/settings: Add Docker VMM: fix style Signed-off-by: Dorin Geman --- content/manuals/desktop/settings.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/manuals/desktop/settings.md b/content/manuals/desktop/settings.md index bb7e1fe90f17..d0d6ef715b5e 100644 --- a/content/manuals/desktop/settings.md +++ b/content/manuals/desktop/settings.md @@ -60,18 +60,18 @@ If you choose the integrated terminal, you can run commands in a running contain For more information, see [containerd image store](containerd.md). - {{< badge color=blue text="Mac only" >}} **Choose Virtual Machine Manager (VMM)**. Choose the Virtual Machine Monitor for creating and managing the Docker Desktop Linux VM. - - Select **Docker VMM** for the latest and most performant Hypervisor/Virtual Machine Manager. This option is available only on Apple Silicon Macs running macOS 12.5 or later. + - Select **Docker VMM** for the latest and most performant Hypervisor/Virtual Machine Manager. This option is available only on Apple Silicon Macs running macOS 12.5 or later and is currently in Beta. > [!TIP] > > Turn this setting on to make Docker Desktop run faster. - - Alternatively, you can choose **Apple Virtualization Framework**, **QEMU** (for Apple Silicon), or **Hyperkit** (for Intel Macs). For macOS 12.5 and above, Apple Virtualization Framework is the default setting. + - Alternatively, you can choose **Apple Virtualization framework**, **QEMU** (for Apple Silicon), or **Hyperkit** (for Intel Macs). For macOS 12.5 and later, Apple Virtualization framework is the default setting. -- {{< badge color=blue text="Mac only" >}}**Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs (Legacy)**. VirtioFS is only available for macOS versions 12.5 and above, and is turned on by default. +- {{< badge color=blue text="Mac only" >}}**Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs (Legacy)**. VirtioFS is only available for macOS 12.5 and later, and is turned on by default. > [!TIP] > - > Use VirtioFS for speedy file sharing. VirtioFS has reduced the time taken to complete filesystem operations by [up to 98%](https://github.com/docker/roadmap/issues/7#issuecomment-1044452206). It is the only file sharing implementation supported by **Docker VMM**. + > Use VirtioFS for speedy file sharing. VirtioFS has reduced the time taken to complete filesystem operations by [up to 98%](https://github.com/docker/roadmap/issues/7#issuecomment-1044452206). It is the only file sharing implementation supported by Docker VMM. -- {{< badge color=blue text="Mac only" >}}**Use Rosetta for x86_64/amd64 emulation on Apple Silicon**. Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have turned on **Virtualization framework** in the **General** settings tab. You must also be on macOS 13 or later. +- {{< badge color=blue text="Mac only" >}}**Use Rosetta for x86_64/amd64 emulation on Apple Silicon**. Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have turned on **Apple Virtualization framework** in the **General** settings tab. You must also be on macOS 13 or later. - **Send usage statistics**. Select so Docker Desktop sends diagnostics, crash reports, and usage data. This information helps Docker improve and From d121750d922242366dea88c85f65e0a5220ffede Mon Sep 17 00:00:00 2001 From: Dorin Geman Date: Wed, 25 Sep 2024 15:15:30 +0300 Subject: [PATCH 3/3] desktop/settings: Add Docker VMM: fix phrasing Co-authored-by: Mihaela Stoica Signed-off-by: Dorin Geman --- content/manuals/desktop/settings.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/manuals/desktop/settings.md b/content/manuals/desktop/settings.md index d0d6ef715b5e..f0ea9149ed96 100644 --- a/content/manuals/desktop/settings.md +++ b/content/manuals/desktop/settings.md @@ -59,19 +59,19 @@ If you choose the integrated terminal, you can run commands in a running contain and the ability to run Wasm applications with Docker. For more information, see [containerd image store](containerd.md). -- {{< badge color=blue text="Mac only" >}} **Choose Virtual Machine Manager (VMM)**. Choose the Virtual Machine Monitor for creating and managing the Docker Desktop Linux VM. +- {{< badge color=blue text="Mac only" >}} **Choose Virtual Machine Manager (VMM)**. Choose the Virtual Machine Manager for creating and managing the Docker Desktop Linux VM. - Select **Docker VMM** for the latest and most performant Hypervisor/Virtual Machine Manager. This option is available only on Apple Silicon Macs running macOS 12.5 or later and is currently in Beta. > [!TIP] > > Turn this setting on to make Docker Desktop run faster. - - Alternatively, you can choose **Apple Virtualization framework**, **QEMU** (for Apple Silicon), or **Hyperkit** (for Intel Macs). For macOS 12.5 and later, Apple Virtualization framework is the default setting. + - Alternatively, you can choose **Apple Virtualization framework**, **QEMU** (for Apple Silicon), or **HyperKit** (for Intel Macs). For macOS 12.5 and later, Apple Virtualization framework is the default setting. - {{< badge color=blue text="Mac only" >}}**Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs (Legacy)**. VirtioFS is only available for macOS 12.5 and later, and is turned on by default. > [!TIP] > > Use VirtioFS for speedy file sharing. VirtioFS has reduced the time taken to complete filesystem operations by [up to 98%](https://github.com/docker/roadmap/issues/7#issuecomment-1044452206). It is the only file sharing implementation supported by Docker VMM. -- {{< badge color=blue text="Mac only" >}}**Use Rosetta for x86_64/amd64 emulation on Apple Silicon**. Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have turned on **Apple Virtualization framework** in the **General** settings tab. You must also be on macOS 13 or later. +- {{< badge color=blue text="Mac only" >}}**Use Rosetta for x86_64/amd64 emulation on Apple Silicon**. Turns on Rosetta to accelerate x86/AMD64 binary emulation on Apple Silicon. This option is only available if you have selected **Apple Virtualization framework** as the Virtual Machine Manager. You must also be on macOS 13 or later. - **Send usage statistics**. Select so Docker Desktop sends diagnostics, crash reports, and usage data. This information helps Docker improve and