diff --git a/_includes/beta.md b/_includes/beta.md index 483cdd8026..b65d244466 100644 --- a/_includes/beta.md +++ b/_includes/beta.md @@ -1,7 +1,7 @@ -Beta features provide early access to future product functionality. +Beta features provide access to future product functionality. These features are intended for testing and feedback only as they may change -between releases without warning or can be removed entirely from a future +between releases without warning or remove them entirely from a future release. Beta features must not be used in production environments. -Docker does not offer support for beta features. +Docker doesn't offer support for beta features. + -For a list of current experimental features in the Docker CLI, see [Docker CLI Experimental features](https://github.com/docker/cli/blob/master/experimental/README.md). diff --git a/_includes/desktop-experimental.md b/_includes/desktop-experimental.md new file mode 100644 index 0000000000..f2f772bfe6 --- /dev/null +++ b/_includes/desktop-experimental.md @@ -0,0 +1,3 @@ +On the **Experimental features** tab, you have the option to allow feature flags. These are features that Docker is currently experimenting with. This is switched on by default. + +These features are intended for testing and feedback only as they may change between releases without warning or remove them entirely from a future release. Docker doesn't offer support for experimental features. diff --git a/desktop/settings/linux.md b/desktop/settings/linux.md index ce2050b182..b13c9bb495 100644 --- a/desktop/settings/linux.md +++ b/desktop/settings/linux.md @@ -130,18 +130,6 @@ Type a JSON configuration file in the box to configure the daemon settings. For Click **Apply & Restart** to save your settings and restart Docker Desktop. -## Beta Features - -{% include beta.md %} - -From the **Beta features** tab, you can sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/){:target="_blank" rel="noopener" class="_"}. - -On the **Beta features** tab, you also have the option to allow feature flags, which are product features Docker is currently experimenting with. This is switched on by default. - -### Enable containerd - -Turns on the experimental containerd image store. This brings new features like namespaces and faster container startup performance by lazy-pulling images. - ## Kubernetes Docker Desktop includes a standalone Kubernetes server, so that you can test @@ -183,3 +171,21 @@ Use the **Extensions** tab to: - **Show Docker Extensions system containers** For more information about Docker extensions, see [Extensions](../extensions/index.md). + +## Features in development + +On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**. + +You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/){:target="_blank" rel="noopener" class="_"} from the **Features in development** tab. + +### Beta features + +{% include beta.md %} + +#### Enable containerd + +Turns on the experimental containerd image store. This brings new features like faster container startup performance by lazy-pulling images, and the ability to run Wasm applications with Docker. + +### Experimental features + +{% include desktop-experimental.md %} diff --git a/desktop/settings/mac.md b/desktop/settings/mac.md index 5891acb337..3b2cd18a11 100644 --- a/desktop/settings/mac.md +++ b/desktop/settings/mac.md @@ -32,8 +32,7 @@ On the **General** tab, you can configure when to start Docker and specify other - **Use Virtualization framework**. Select to allow Docker Desktop to use the `virtualization.framework` instead of the `hypervisor.framework`. -- **Use gRPC FUSE for file sharing**. Clear this check box to use the legacy - osxfs file sharing instead. +- **Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs**. The **VirtioFS** option is only available for macOS versions 12.5 and above. - **Send usage statistics**. Select so Docker Desktop sends diagnostics, crash reports, and usage data. This information helps Docker improve and @@ -163,30 +162,6 @@ Type a JSON configuration file in the box to configure the daemon settings. For Click **Apply & Restart** to save your settings and restart Docker Desktop. -## Beta Features - -{% include beta.md %} - -On the **Beta features** tab, you also have the option to allow feature flags, which are product features Docker is currently experimenting with. This is switched on by default. - -### Enable VirtioFS - - Docker Desktop for Mac lets developers use a new experimental file-sharing implementation called [virtiofS](https://virtio-fs.gitlab.io/){: target='_blank' rel='noopener' class='_'}; the current default is gRPC-FUSE. virtiofs has been found to significantly improve file sharing performance on macOS. For more details, see our blog post [Speed boost achievement unlocked on Docker Desktop 4.6 for Mac](https://www.docker.com/blog/speed-boost-achievement-unlocked-on-docker-desktop-4-6-for-mac/){:target="_blank" rel="noopener" class="_"}. - -To enable virtioFS: - -1. Verify that you are on the following macOS version: - - macOS 12.2 or later (for Apple Silicon) - - macOS 12.3 or later (for Intel) - -2. Select **Enable VirtioFS accelerated directory sharing** to enable virtioFS. - -3. Click **Apply & Restart**. - -### Enable containerd - -Turns on the experimental containerd image store. This brings new features like namespaces and faster container startup performance by lazy-pulling images. - ## Kubernetes Docker Desktop includes a standalone Kubernetes server, so that you can test @@ -228,3 +203,21 @@ Use the **Extensions** tab to: - **Show Docker Extensions system containers** For more information about Docker extensions, see [Extensions](../extensions/index.md). + +## Features in development + +On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**. + +You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/){:target="_blank" rel="noopener" class="_"} from the **Features in development** tab. + +### Beta features + +{% include beta.md %} + +#### Enable containerd + +Turns on the experimental containerd image store. This brings new features like faster container startup performance by lazy-pulling images, and the ability to run Wasm applications with Docker. + +### Experimental features + +{% include desktop-experimental.md %} diff --git a/desktop/settings/windows.md b/desktop/settings/windows.md index 45b54a3866..931103f908 100644 --- a/desktop/settings/windows.md +++ b/desktop/settings/windows.md @@ -203,20 +203,6 @@ Type a JSON configuration file in the box to configure the daemon settings. For Click **Apply & Restart** to save your settings and restart Docker Desktop. -## Beta features - -{% include beta.md %} - - -On the **Beta features** tab, you also have the option to allow feature flags, which are product features Docker is currently experimenting with. This is switched on by default. - -From the **Beta features** tab, you can sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/){:target="_blank" rel="noopener" class="_"}. - - -### Enable containerd - -Turns on the experimental containerd image store. This brings new features like namespaces and faster container startup performance by lazy-pulling images. - ## Kubernetes > **Note** @@ -253,7 +239,7 @@ when an update becomes available. After downloading the update, click **Apply and Restart** to install the update. You can do this either through the Docker menu or in the **Updates** section in the Docker Dashboard. -## Extensions +## Features in development Use the **Extensions** tab to: @@ -262,3 +248,21 @@ Use the **Extensions** tab to: - **Show Docker Extensions system containers** For more information about Docker extensions, see [Extensions](../extensions/index.md). + +## Feature control + +On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**. + +You can also sign up to the [Developer Preview Program](https://www.docker.com/community/get-involved/developer-preview/){:target="_blank" rel="noopener" class="_"} from the **Features in development** tab. + +### Beta features + +{% include beta.md %} + +#### Enable containerd + +Turns on the experimental containerd image store. This brings new features like faster container startup performance by lazy-pulling images, and the ability to run Wasm applications with Docker. + +### Experimental features + +{% include desktop-experimental.md %} \ No newline at end of file diff --git a/desktop/troubleshoot/known-issues.md b/desktop/troubleshoot/known-issues.md index 542e963cbf..37cb0e0da0 100644 --- a/desktop/troubleshoot/known-issues.md +++ b/desktop/troubleshoot/known-issues.md @@ -10,20 +10,6 @@ title: Known issues for Docker Desktop on Mac