Skip to content

Commit a45063a

Browse files
authored
Merge pull request #24147 from dvdksn/fix-default-image-store
fix: update outdated references to the classic image store being default
2 parents 4d557e6 + 3aff2db commit a45063a

2 files changed

Lines changed: 29 additions & 50 deletions

File tree

content/manuals/build/metadata/attestations/_index.md

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,27 @@ to see if images you are already using are exposed to vulnerabilities.
4343

4444
## Creating attestations
4545

46-
When you build an image with `docker buildx build`, you can add attestation
47-
records to the resulting image using the `--provenance` and `--sbom` options.
48-
You can opt in to add either the SBOM or provenance attestation type, or both.
49-
50-
```console
51-
$ docker buildx build --sbom=true --provenance=true .
46+
BuildKit generates the attestations when building the image. Provenance
47+
attestations with the `mode=min` level are added to images by default. The
48+
attestation records are wrapped in the in-toto JSON format and attached to the
49+
image index in a manifest for the final image.
50+
51+
You can customize attestation behavior using the `--provenance` and `--sbom`
52+
flags:
53+
54+
```bash
55+
# Opt in to SBOM attestations:
56+
docker buildx build --sbom=true .
57+
# Opt in to max-level provenance attestations:
58+
docker buildx build --provenance=mode=max .
59+
# Opt out of provenance attestations:
60+
docker buildx build --provenance=false .
5261
```
5362

54-
> [!NOTE]
55-
>
56-
> The default image store doesn't support attestations. If you're using the
57-
> default image store and you build an image using the default `docker` driver,
58-
> or using a different driver with the `--load` flag, the attestations are
59-
> lost.
60-
>
61-
> To make sure the attestations are preserved, you can:
62-
>
63-
> - Use a `docker-container` driver with the `--push` flag to push the image to
64-
> a registry directly.
65-
> - Enable the [containerd image store](/manuals/desktop/features/containerd.md).
66-
67-
> [!NOTE]
68-
>
69-
> Provenance attestations are enabled by default, with the `mode=min` option.
70-
> You can disable provenance attestations using the `--provenance=false` flag,
71-
> or by setting the [`BUILDX_NO_DEFAULT_ATTESTATIONS`](/manuals/build/building/variables.md#buildx_no_default_attestations) environment variable.
72-
>
73-
> Using the `--provenance=true` flag attaches provenance attestations with `mode=min`
74-
> by default. See [Provenance attestation](./slsa-provenance.md) for more details.
75-
76-
BuildKit generates the attestations when building the image. The attestation
77-
records are wrapped in the in-toto JSON format and attached to the image
78-
index in a manifest for the final image.
63+
You can also disable default provenance attestations by setting the
64+
[`BUILDX_NO_DEFAULT_ATTESTATIONS`](/manuals/build/building/variables.md#buildx_no_default_attestations)
65+
environment variable. See [Provenance attestation](./slsa-provenance.md) for
66+
more details about provenance modes and options.
7967

8068
## Storage
8169

content/manuals/desktop/features/containerd.md

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,23 @@ it's a prerequisite for unlocking a range of new use cases, including:
4949

5050
## Enable the containerd image store
5151

52-
The containerd image store is enabled by default in Docker Desktop version 4.34
53-
and later, but only for clean installs or if you perform a factory reset. If
54-
you upgrade from an earlier version of Docker Desktop, or if you use an older
55-
version of Docker Desktop you must manually switch to the containerd image
56-
store.
52+
The containerd image store is enabled by default in Docker Desktop version 4.52
53+
and later.
5754

58-
To manually enable this feature in Docker Desktop:
55+
To manually select which image store Docker Desktop uses:
5956

6057
1. Navigate to **Settings** in Docker Desktop.
61-
2. In the **General** tab, check **Use containerd for pulling and storing images**.
58+
2. In the **General** tab, check or clear the **Use containerd for pulling and storing images** option.
6259
3. Select **Apply**.
6360

64-
To disable the containerd image store,
65-
clear the **Use containerd for pulling and storing images** checkbox.
66-
6761
## Build multi-platform images
6862

69-
The term multi-platform image refers to a bundle of images for multiple different architectures.
70-
Out of the box, the default builder for Docker Desktop doesn't support building multi-platform images.
63+
Enabling the containerd image store lets you build multi-platform images
64+
and load them to your local image store:
65+
66+
<script async id="asciicast-ZSUI4Mi2foChLjbevl2dxt5GD" src="https://asciinema.org/a/ZSUI4Mi2foChLjbevl2dxt5GD.js"></script>
67+
68+
Building multi-platform images with the classic image store is not supported:
7169

7270
```console
7371
$ docker build --platform=linux/amd64,linux/arm64 .
@@ -76,10 +74,3 @@ ERROR: Multi-platform build is not supported for the docker driver.
7674
Switch to a different driver, or turn on the containerd image store, and try again.
7775
Learn more at https://docs.docker.com/go/build-multi-platform/
7876
```
79-
80-
Enabling the containerd image store lets you build multi-platform images
81-
and load them to your local image store:
82-
83-
<script async id="asciicast-ZSUI4Mi2foChLjbevl2dxt5GD" src="https://asciinema.org/a/ZSUI4Mi2foChLjbevl2dxt5GD.js"></script>
84-
85-

0 commit comments

Comments
 (0)