Skip to content

Commit 602b520

Browse files
authored
Merge pull request #23072 from vvoland/docker-28.3.2-fix
vendor: github.com/docker/cli v28.3.3-dev (c69d8bde4adc)
2 parents 01644c3 + 5f0ef1d commit 602b520

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

_vendor/github.com/docker/cli/docs/reference/dockerd.md

Lines changed: 22 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# github.com/moby/moby v28.3.2+incompatible
22
# github.com/moby/buildkit v0.23.2
33
# github.com/docker/buildx v0.25.0
4-
# github.com/docker/cli v28.3.1+incompatible
4+
# github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible
55
# github.com/docker/compose/v2 v2.38.2
66
# github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2
77
# github.com/docker/scout-cli v1.15.0

data/engine-cli/docker_container_run.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,15 +1915,14 @@ examples: |-
19151915
19161916
#### CDI devices
19171917
1918-
> [!NOTE]
1919-
> The CDI feature is experimental, and potentially subject to change.
1920-
> CDI is currently only supported for Linux containers.
1921-
19221918
[Container Device Interface
19231919
(CDI)](https://github.com/cncf-tags/container-device-interface/blob/main/SPEC.md)
19241920
is a standardized mechanism for container runtimes to create containers which
19251921
are able to interact with third party devices.
19261922
1923+
CDI is currently only supported for Linux containers and is enabled by default
1924+
since Docker Engine 28.3.0.
1925+
19271926
With CDI, device configurations are declaratively defined using a JSON or YAML
19281927
file. In addition to enabling the container to interact with the device node,
19291928
it also lets you specify additional configuration for the device, such as
@@ -1944,7 +1943,7 @@ examples: |-
19441943
available on the system running the daemon, in one of the configured CDI
19451944
specification directories.
19461945
- The CDI feature has been enabled in the daemon; see [Enable CDI
1947-
devices](/reference/cli/dockerd/#enable-cdi-devices).
1946+
devices](/reference/cli/dockerd/#configure-cdi-devices).
19481947
19491948
### Attach to STDIN/STDOUT/STDERR (-a, --attach) {#attach}
19501949

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.0
44

55
require (
66
github.com/docker/buildx v0.25.0 // indirect
7-
github.com/docker/cli v28.3.1+incompatible // indirect
7+
github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible // indirect
88
github.com/docker/compose/v2 v2.38.2 // indirect
99
github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2 // indirect
1010
github.com/docker/scout-cli v1.15.0 // indirect
@@ -14,7 +14,7 @@ require (
1414

1515
replace (
1616
github.com/docker/buildx => github.com/docker/buildx v0.25.0
17-
github.com/docker/cli => github.com/docker/cli v28.3.0+incompatible
17+
github.com/docker/cli => github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible
1818
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.38.2
1919
github.com/docker/model-cli => github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2
2020
github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ github.com/docker/cli v28.2.1+incompatible h1:AYyTcuwvhl9dXdyCiXlOGXiIqSNYzTmaDN
3434
github.com/docker/cli v28.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
3535
github.com/docker/cli v28.3.0+incompatible h1:s+ttruVLhB5ayeuf2BciwDVxYdKi+RoUlxmwNHV3Vfo=
3636
github.com/docker/cli v28.3.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
37+
github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible h1:5I561JBDi4n0RKxYNkUVc9xiLnlCfjjm31XRV0r3o98=
38+
github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
3739
github.com/docker/compose/v2 v2.36.2 h1:rxk1PUUbhbAS6HkGsYo9xUmMBpKtVwFMNCQjE4+i5fk=
3840
github.com/docker/compose/v2 v2.36.2/go.mod h1:mZygkne+MAMu/e1B28PBFmG0Z0WefbxZ/IpcjSFdrw8=
3941
github.com/docker/compose/v2 v2.37.0 h1:R8Yik9ssiRz7T9BRfdOZy0xHDzOFPIJX40DrxzJ62dQ=

0 commit comments

Comments
 (0)