Skip to content

Commit 271fea3

Browse files
authored
Merge pull request #277 from vvoland/docker-cdi-default
README: Docker 28.2 enables CDI by default
2 parents fc17f51 + 55e91bd commit 271fea3

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

README.md

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,24 @@ file (`/etc/containerd/config.toml` by default):
9292

9393
Remember to restart containerd for any configuration changes to take effect.
9494

95-
### Docker configuration
95+
### Docker and Podman Configuration
9696

97-
To enable and configure CDI support in the [Docker Daemon](https://github.com/moby/moby)
98-
[Docker 25](https://github.com/moby/moby/releases/tag/v25.0.0) or later is required.
97+
Both [Docker Daemon](https://github.com/moby/moby) and
98+
[podman](https://github.com/containers/podman) support CDI and process specified
99+
`--device` flags directly. If fully-qualified device selectors
100+
(e.g., `vendor.com/device=myDevice`) are included, the CDI specifications at the
101+
default location (`/etc/cdi` and `/var/run/cdi`) are checked for matching
102+
devices.
99103

100-
In addition, the CDI feature must be enabled. That means including the following in the daemon
101-
config (`/etc/docker/daemon.json` by default):
104+
Podman does not require any specific configuration to enable CDI support.
105+
106+
Docker has CDI enabled by default beginning with version **28.2.0**.
107+
108+
#### Docker older than 28.2.0
109+
110+
Docker supports CDI since version **25.0.0**.
111+
112+
For Docker versions between **25.0.0** and **28.1.1**, you'll need to enable the CDI feature by including the following in the daemon configuration file (`/etc/docker/daemon.json` by default):
102113

103114
```json
104115
{
@@ -107,23 +118,11 @@ config (`/etc/docker/daemon.json` by default):
107118
}
108119
}
109120
```
121+
Remember to restart the Docker daemon for any configuration changes to take effect.
110122

111-
Remember to restart to Docker daemon for any configuration changes to take effect.
112-
113-
### Podman configuration
114-
115-
[podman](https://github.com/containers/podman) does not require any specific
116-
configuration to enable CDI support and processes specified `--device` flags
117-
directly. If fully-qualified device selectors (e.g.
118-
`vendor.com/device=myDevice`) are included the CDI specifications at the default
119-
location (`/etc/cdi` and `/var/run/cdi`) are checked for matching devices.
123+
#### Podman
120124

121-
*Note:* Although initial support was added in
122-
[`v3.2.0`](https://github.com/containers/podman/releases/tag/v3.2.0) this was
123-
updated for the tagged `v0.3.0` CDI spec in
124-
[`v4.1.0-rc.1`](https://github.com/containers/podman/releases/tag/v4.1.0-rc1)
125-
with [commit
126-
a234e4e](https://github.com/containers/podman/commit/a234e4e19662e172472877ce69523f4afea5c12e).
125+
Although initial support was added in [`v3.2.0`](https://github.com/containers/podman/releases/tag/v3.2.0), this was updated for the tagged `v0.3.0` CDI spec in [`v4.1.0-rc.1`](https://github.com/containers/podman/releases/tag/v4.1.0-rc1) with [commit a234e4e](https://github.com/containers/podman/commit/a234e4e19662e172472877ce69523f4afea5c12e).
127126

128127
## Examples
129128
### Full-blown CDI specification

0 commit comments

Comments
 (0)