From bbbdfcd6b0eee9b0f871424471f11643cfed1dea Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:28:17 +0100 Subject: [PATCH] desktop: containerd general availability (#19105) Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/desktop/containerd.md | 21 +++++---------------- content/desktop/settings/linux.md | 12 +++++++----- content/desktop/settings/mac.md | 10 ++++++---- content/desktop/settings/windows.md | 12 +++++++----- data/toc.yaml | 2 +- 5 files changed, 26 insertions(+), 31 deletions(-) diff --git a/content/desktop/containerd.md b/content/desktop/containerd.md index bb2a9603a4..4c096b7a39 100644 --- a/content/desktop/containerd.md +++ b/content/desktop/containerd.md @@ -1,5 +1,5 @@ --- -title: containerd image store (Beta) +title: containerd image store description: How to activate the containerd integration feature in Docker Desktop keywords: Docker, containerd, engine, image store, lazy-pull toc_max: 3 @@ -8,14 +8,6 @@ toc_max: 3 This page provides information about the ongoing integration of `containerd` for image and file system management in the Docker Engine. -> **Beta** -> -> The containerd image store feature is currently in -> [Beta](../release-lifecycle.md/#beta). We recommend that you do not use -> this feature in production environments as this feature may change or be -> removed from future releases. -{ .experimental } - ## What is the containerd image store? `containerd` is a container runtime that manages the container lifecycle, and @@ -45,15 +37,12 @@ yet supported. ## Turn on the containerd image store feature -The containerd image store beta feature is turned off by default. - -To start using the feature: +The containerd image store isn't turned on by default. To start using the +feature: 1. Navigate to **Settings**. -2. From the **Features in development** tab, select **Beta features**. -3. Next to **Use containerd for pulling and storing images**, select the - checkbox. -4. Select **Apply & Restart** +2. In the **General** tab, check **Use containerd for pulling and storing images**. +3. Select **Apply & Restart** To turn off this feature, clear the **Use containerd for pulling and storing images** checkbox. diff --git a/content/desktop/settings/linux.md b/content/desktop/settings/linux.md index fe202c6ced..a4a2a4df66 100644 --- a/content/desktop/settings/linux.md +++ b/content/desktop/settings/linux.md @@ -26,6 +26,12 @@ On the **General** tab, you can configure when to start Docker and specify other - **Choose theme for Docker Desktop**. Choose whether you want to apply a **Light** or **Dark** theme to Docker Desktop. Alternatively you can set Docker Desktop to **Use System Settings**. +- **Use containerd for pulling and storing images**. + Turns on the 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. + For more information, see [containerd image store](../containerd.md). + - **Choose container terminal**. Determines which terminal is launched when opening the terminal from a container. If you choose the integrated terminal, you can run commands in a running container straight from the Docker Dashboard. For more information, see [Explore containers](../use-desktop/container.md). @@ -236,14 +242,10 @@ You can also sign up to the [Developer Preview program](https://www.docker.com/c {{< include "beta.md" >}} -#### Use containerd for pulling and storing images - -Turns on the 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. For more information, see [containerd image store](../containerd/index.md). - ### Experimental features {{< include "desktop-experimental.md" >}} ## Notifications -{{< include "desktop-notifications-settings.md" >}} \ No newline at end of file +{{< include "desktop-notifications-settings.md" >}} diff --git a/content/desktop/settings/mac.md b/content/desktop/settings/mac.md index 8d486c979a..1998cbee1c 100644 --- a/content/desktop/settings/mac.md +++ b/content/desktop/settings/mac.md @@ -37,6 +37,12 @@ If you choose the integrated terminal, you can run commands in a running contain - **Include VM in Time Machine backups**. Select to back up the Docker Desktop virtual machine. This option is turned off by default. +- **Use containerd for pulling and storing images**. + Turns on the 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. + For more information, see [containerd image store](../containerd.md). + - **Use Virtualization framework**. Select to allow Docker Desktop to use the `virtualization.framework` instead of the `hypervisor.framework`. > **Tip** > @@ -283,10 +289,6 @@ You can also sign up to the [Developer Preview program](https://www.docker.com/c {{< include "beta.md" >}} -#### Use containerd for pulling and storing images - -Turns on the 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. For more information, see [containerd image store](../containerd/index.md). - ### Experimental features {{< include "desktop-experimental.md" >}} diff --git a/content/desktop/settings/windows.md b/content/desktop/settings/windows.md index a3d76b223c..53e3ea53c9 100644 --- a/content/desktop/settings/windows.md +++ b/content/desktop/settings/windows.md @@ -26,6 +26,12 @@ On the **General** tab, you can configure when to start Docker and specify other - **Choose theme for Docker Desktop**. Choose whether you want to apply a **Light** or **Dark** theme to Docker Desktop. Alternatively you can set Docker Desktop to **Use System Settings**. +- **Use containerd for pulling and storing images**. + Turns on the 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. + For more information, see [containerd image store](../containerd.md). + - **Choose container terminal**. Determines which terminal is launched when opening the terminal from a container. If you choose the integrated terminal, you can run commands in a running container straight from the Docker Dashboard. For more information, see [Explore containers](../use-desktop/container.md). @@ -321,14 +327,10 @@ You can also sign up to the [Developer Preview Program](https://www.docker.com/c {{< include "beta.md" >}} -#### Use containerd for pulling and storing images - -Turns on the 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. For more information, see [containerd image store](../containerd/index.md). - ### Experimental features {{< include "desktop-experimental.md" >}} ## Notifications -{{< include "desktop-notifications-settings.md" >}} \ No newline at end of file +{{< include "desktop-notifications-settings.md" >}} diff --git a/data/toc.yaml b/data/toc.yaml index 290e23d2b4..f7e93d8adb 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -1125,7 +1125,7 @@ Manuals: - path: /desktop/dev-environments/dev-cli/ title: Use the docker dev CLI plugin - path: /desktop/containerd/ - title: containerd image store (Beta) + title: containerd image store - path: /desktop/wasm/ title: Wasm workloads (Beta) - path: /desktop/synchronized-file-sharing/