Skip to content

Commit b65c890

Browse files
authored
Merge pull request #20802 from dvdksn/c8d-default
desktop: containerd default store for 4.34 fresh installs
2 parents 630a2a2 + 6d7712b commit b65c890

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

content/desktop/containerd.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ image and file system management in the Docker Engine.
1010

1111
> [!NOTE]
1212
>
13-
> After switching to the containerd image store,
14-
> images and containers in the classic image store won't be visible.
15-
> All of those containers and images still exist.
16-
> To see them again, turn off the containerd image store feature.
13+
> Images and containers are not shared between the classic image store and the
14+
> new containerd image store. When you switch image stores, containers and
15+
> images from the inactive store remain but are hidden until you switch back.
1716
1817
## What is containerd?
1918

@@ -53,8 +52,13 @@ it's a prerequisite for unlocking a range of new use cases, including:
5352

5453
## Enable the containerd image store
5554

56-
The containerd image store isn't enabled by default.
57-
To enable the feature for Docker Desktop:
55+
The containerd image store is enabled by default in Docker Desktop version 4.34
56+
and later, but only for clean installs or if you perform a factory reset. If
57+
you upgrade from an earlier version of Docker Desktop, or if you use an older
58+
version of Docker Desktop you must manually switch to the containerd image
59+
store.
60+
61+
To manually enable this feature in Docker Desktop:
5862

5963
1. Navigate to **Settings** in Docker Desktop.
6064
2. In the **General** tab, check **Use containerd for pulling and storing images**.

content/desktop/wasm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,14 @@ This section contains instructions on how to resolve common issues.
184184

185185
### Unknown runtime specified
186186

187-
If you try to run a Wasm container before you have opted in to use the
188-
containerd image store, an error similar to the following displays:
187+
If you try to run a Wasm container without the [containerd image
188+
store](./containerd.md), an error similar to the following displays:
189189

190190
```text
191191
docker: Error response from daemon: Unknown runtime specified io.containerd.wasmedge.v1.
192192
```
193193

194-
[Turn on the containerd feature](containerd.md#turn-on-the-containerd-image-store-feature)
194+
[Turn on the containerd feature](./containerd.md#enable-the-containerd-image-store)
195195
in Docker Desktop settings and try again.
196196

197197
### Failed to start shim: failed to resolve runtime path

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ $ docker build --tag <org>/<image> \
7575
--push .
7676
```
7777

78-
To build images with SBOM attestations, you must either turn on
79-
the [containerd image store](/desktop/containerd.md) feature, or use a
80-
`docker-container` builder together with the `--push` flag to push the image
81-
(with attestations) directly to a registry.
78+
To build images with SBOM attestations, you must use either the [containerd
79+
image store](/desktop/containerd.md) feature, or use a `docker-container`
80+
builder together with the `--push` flag to push the image (with attestations)
81+
directly to a registry. The classic image store doesn't support manifest lists
82+
or image indices, which is required for adding attestations to an image.
8283

8384
## Extract to file
8485

content/scout/quickstart.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,13 @@ built so that it can provide a better evaluation result.
204204
Before you can build an image with attestations,
205205
you must enable the [containerd image store](../desktop/containerd.md)
206206
(or create a custom builder using the `docker-container` driver).
207-
The default image store doesn't support manifest lists,
207+
The classic image store doesn't support manifest lists,
208208
which is how the provenance attestations are attached to an image.
209209

210-
Open **Settings** in Docker Desktop. Under the **General** section,
211-
check the **Use containerd for pulling and storing images** option.
212-
Note that changing the image store hides existing images and containers until you switch back.
210+
Open **Settings** in Docker Desktop. Under the **General** section, make sure
211+
that the **Use containerd for pulling and storing images** option is checked.
212+
Note that changing image stores temporarily hides images and containers of the
213+
inactive image store until you switch back.
213214

214215
With the containerd image store enabled, rebuild the image with a new `v3` tag.
215216
This time, add the `--provenance=true` and `--sbom=true` flags.

0 commit comments

Comments
 (0)