Merge pull request #20802 from dvdksn/c8d-default

desktop: containerd default store for 4.34 fresh installs

content/desktop/containerd.md

@@ -10,10 +10,9 @@ image and file system management in the Docker Engine.
 
 > [!NOTE]
 > 
-> After switching to the containerd image store,
-> images and containers in the classic image store won't be visible.
-> All of those containers and images still exist.
-> To see them again, turn off the containerd image store feature.
+> Images and containers are not shared between the classic image store and the
+> new containerd image store. When you switch image stores, containers and
+> images from the inactive store remain but are hidden until you switch back.
 
 ## What is containerd?
 
@@ -53,8 +52,13 @@ it's a prerequisite for unlocking a range of new use cases, including:
 
 ## Enable the containerd image store
 
-The containerd image store isn't enabled by default.
-To enable the feature for Docker Desktop:
+The containerd image store is enabled by default in Docker Desktop version 4.34
+and later, but only for clean installs or if you perform a factory reset. If
+you upgrade from an earlier version of Docker Desktop, or if you use an older
+version of Docker Desktop you must manually switch to the containerd image
+store.
+
+To manually enable this feature in Docker Desktop:
 
 1. Navigate to **Settings** in Docker Desktop.
 2. In the **General** tab, check **Use containerd for pulling and storing images**.

content/desktop/wasm.md

@@ -184,14 +184,14 @@ This section contains instructions on how to resolve common issues.
 
 ### Unknown runtime specified
 
-If you try to run a Wasm container before you have opted in to use the
-containerd image store, an error similar to the following displays:
+If you try to run a Wasm container without the [containerd image
+store](./containerd.md), an error similar to the following displays:
 
 ```text
 docker: Error response from daemon: Unknown runtime specified io.containerd.wasmedge.v1.
 ```
 
-[Turn on the containerd feature](containerd.md#turn-on-the-containerd-image-store-feature)
+[Turn on the containerd feature](./containerd.md#enable-the-containerd-image-store)
 in Docker Desktop settings and try again.
 
 ### Failed to start shim: failed to resolve runtime path

content/scout/how-tos/view-create-sboms.md

@@ -75,10 +75,11 @@ $ docker build --tag <org>/<image> \
   --push .
 ```
 
-To build images with SBOM attestations, you must either turn on
-the [containerd image store](/desktop/containerd.md) feature, or use a
-`docker-container` builder together with the `--push` flag to push the image
-(with attestations) directly to a registry.
+To build images with SBOM attestations, you must use either the [containerd
+image store](/desktop/containerd.md) feature, or use a `docker-container`
+builder together with the `--push` flag to push the image (with attestations)
+directly to a registry. The classic image store doesn't support manifest lists
+or image indices, which is required for adding attestations to an image.
 
 ## Extract to file
 

content/scout/quickstart.md

@@ -204,12 +204,13 @@ built so that it can provide a better evaluation result.
 Before you can build an image with attestations,
 you must enable the [containerd image store](../desktop/containerd.md)
 (or create a custom builder using the `docker-container` driver).
-The default image store doesn't support manifest lists,
+The classic image store doesn't support manifest lists,
 which is how the provenance attestations are attached to an image.
 
-Open **Settings** in Docker Desktop. Under the **General** section,
-check the **Use containerd for pulling and storing images** option.
-Note that changing the image store hides existing images and containers until you switch back.
+Open **Settings** in Docker Desktop. Under the **General** section, make sure
+that the **Use containerd for pulling and storing images** option is checked.
+Note that changing image stores temporarily hides images and containers of the
+inactive image store until you switch back.
 
 With the containerd image store enabled, rebuild the image with a new `v3` tag.
 This time, add the `--provenance=true` and `--sbom=true` flags.