diff --git a/_vendor/github.com/docker/cli/docs/reference/dockerd.md b/_vendor/github.com/docker/cli/docs/reference/dockerd.md index ce97427a19c..1e2b01633c5 100644 --- a/_vendor/github.com/docker/cli/docs/reference/dockerd.md +++ b/_vendor/github.com/docker/cli/docs/reference/dockerd.md @@ -840,42 +840,49 @@ $ docker run -it --add-host host.docker.internal:host-gateway \ PING host.docker.internal (2001:db8::1111): 56 data bytes ``` -### Enable CDI devices - -> [!NOTE] -> This is experimental feature and as such doesn't represent a stable API. -> -> This feature isn't enabled by default. To this feature, set `features.cdi` to -> `true` in the `daemon.json` configuration file. +### Configure CDI devices Container Device Interface (CDI) is a [standardized](https://github.com/cncf-tags/container-device-interface/blob/main/SPEC.md) mechanism for container runtimes to create containers which are able to interact with third party devices. +CDI is currently only supported for Linux containers and is enabled by default +since Docker Engine 28.3.0. + The Docker daemon supports running containers with CDI devices if the requested device specifications are available on the filesystem of the daemon. -The default specification directors are: +The default specification directories are: - `/etc/cdi/` for static CDI Specs - `/var/run/cdi` for generated CDI Specs -Alternatively, you can set custom locations for CDI specifications using the +#### Set custom locations + +To set custom locations for CDI specifications, use the `cdi-spec-dirs` option in the `daemon.json` configuration file, or the -`--cdi-spec-dir` flag for the `dockerd` CLI. +`--cdi-spec-dir` flag for the `dockerd` CLI: ```json { - "features": { - "cdi": true - }, "cdi-spec-dirs": ["/etc/cdi/", "/var/run/cdi"] } ``` -When CDI is enabled for a daemon, you can view the configured CDI specification -directories using the `docker info` command. +You can view the configured CDI specification directories using the `docker info` command. + +#### Disable CDI devices + +The feature in enabled by default. To disable it, use the `cdi` options in the `deamon.json` file: + +```json +"features": { + "cdi": false +}, +``` + +To check the status of the CDI devices, run `docker info`. #### Daemon logging format {#log-format} diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout.yaml index 4204e61c52b..8dbe2951d67 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout.yaml @@ -20,6 +20,7 @@ cname: - docker scout recommendations - docker scout repo - docker scout version + - docker scout watch clink: - docker_scout_attestation.yaml - docker_scout_cache.yaml @@ -36,6 +37,7 @@ clink: - docker_scout_recommendations.yaml - docker_scout_repo.yaml - docker_scout_version.yaml + - docker_scout_watch.yaml options: - option: debug value_type: bool diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_attestation_add.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_attestation_add.yaml index f6850825358..46a6b2a140c 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_attestation_add.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_attestation_add.yaml @@ -16,6 +16,15 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: org + value_type: string + description: Namespace of the Docker organization + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: predicate-type value_type: string description: Predicate-type for attestations @@ -25,6 +34,26 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: referrer + value_type: bool + default_value: "false" + description: Use OCI referrer API for pushing attestation + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: referrer-repository + value_type: string + default_value: registry.scout.docker.com + description: Repository to push referrer to + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false inherited_options: - option: debug value_type: bool diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_compare.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_compare.yaml index a6a986c0a8d..efd7ecdf813 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_compare.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_compare.yaml @@ -55,7 +55,7 @@ options: value_type: stringSlice default_value: '[]' description: | - Comma separated list of conditions to fail the action step if worse, options are: vulnerability, policy + Comma separated list of conditions to fail the action step if worse or changed, options are: vulnerability, policy, package deprecated: false hidden: false experimental: false diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_cves.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_cves.yaml index 896c3b4d0bb..eaef8f8a1b7 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_cves.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_cves.yaml @@ -135,6 +135,25 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: local + value_type: bool + default_value: "false" + description: Local mode + deprecated: false + hidden: true + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: local-vulndb + value_type: string + description: Local vulnerability database + deprecated: false + hidden: true + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: locations value_type: bool default_value: "false" diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_integration_list.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_integration_list.yaml index 00db4ef6877..9c2a5492060 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_integration_list.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_integration_list.yaml @@ -1,5 +1,5 @@ command: docker scout integration list -short: Integration Docker Scout +short: List integrations which can be installed long: | The docker scout integration list configured integrations for an organization. usage: docker scout integration list [INTEGRATION] diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_push.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_push.yaml index b48952c9613..361b89e3f89 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_push.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_push.yaml @@ -63,6 +63,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: secrets + value_type: bool + default_value: "false" + description: Scan for secrets in the image + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: timestamp value_type: string description: Timestamp of image or tag creation diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_sbom.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_sbom.yaml index 7a804e37e9d..d51d5d5d2cb 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_sbom.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_sbom.yaml @@ -93,6 +93,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: secrets + value_type: bool + default_value: "false" + description: Scan for secrets in the image + deprecated: false + hidden: true + experimental: false + experimentalcli: false + kubernetes: false + swarm: false inherited_options: - option: debug value_type: bool diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_attestation_add.md b/_vendor/github.com/docker/scout-cli/docs/scout_attestation_add.md index 5f09c0fffda..5517741c166 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_attestation_add.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_attestation_add.md @@ -9,10 +9,13 @@ Add attestation to image ### Options -| Name | Type | Default | Description | -|:-------------------|:--------------|:--------|:----------------------------------------| -| `--file` | `stringSlice` | | File location of attestations to attach | -| `--predicate-type` | `string` | | Predicate-type for attestations | +| Name | Type | Default | Description | +|:------------------------|:--------------|:----------------------------|:---------------------------------------------| +| `--file` | `stringSlice` | | File location of attestations to attach | +| `--org` | `string` | | Namespace of the Docker organization | +| `--predicate-type` | `string` | | Predicate-type for attestations | +| `--referrer` | | | Use OCI referrer API for pushing attestation | +| `--referrer-repository` | `string` | `registry.scout.docker.com` | Repository to push referrer to | diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_compare.md b/_vendor/github.com/docker/scout-cli/docs/scout_compare.md index f25aa863550..569dab660df 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_compare.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_compare.md @@ -11,7 +11,7 @@ Compare two images and display differences (experimental) | Name | Type | Default | Description | |:----------------------|:--------------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `-x`, `--exit-on` | `stringSlice` | | Comma separated list of conditions to fail the action step if worse, options are: vulnerability, policy | +| `-x`, `--exit-on` | `stringSlice` | | Comma separated list of conditions to fail the action step if worse or changed, options are: vulnerability, policy, package | | `--format` | `string` | `text` | Output format of the generated vulnerability report:
- text: default output, plain text with or without colors depending on the terminal
- markdown: Markdown output
| | `--hide-policies` | | | Hide policy status from the output | | `--ignore-base` | | | Filter out CVEs introduced from base image | diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_integration.md b/_vendor/github.com/docker/scout-cli/docs/scout_integration.md index 9a2def3a0b8..6e2a5cff1f2 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_integration.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_integration.md @@ -9,9 +9,8 @@ Commands to list, configure, and delete Docker Scout integrations |:----------------------------------------------|:----------------------------------------------------| | [`configure`](scout_integration_configure.md) | Configure or update a new integration configuration | | [`delete`](scout_integration_delete.md) | Delete a new integration configuration | -| [`list`](scout_integration_list.md) | Integration Docker Scout | +| [`list`](scout_integration_list.md) | List integrations which can be installed | - diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_integration_list.md b/_vendor/github.com/docker/scout-cli/docs/scout_integration_list.md index 67b39c59fc5..5e906f9210e 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_integration_list.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_integration_list.md @@ -1,7 +1,7 @@ # docker scout integration list -Integration Docker Scout +List integrations which can be installed ### Options @@ -12,4 +12,3 @@ Integration Docker Scout - diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_push.md b/_vendor/github.com/docker/scout-cli/docs/scout_push.md index 09e3397e5c7..3e97c6be94c 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_push.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_push.md @@ -13,6 +13,7 @@ Push an image or image index to Docker Scout | `-o`, `--output` | `string` | | Write the report to a file | | `--platform` | `string` | | Platform of image to be pushed | | `--sbom` | | | Create and upload SBOMs | +| `--secrets` | | | Scan for secrets in the image | | `--timestamp` | `string` | | Timestamp of image or tag creation | diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 1784d211780..3d91ae7b094 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/moby/moby v28.3.2+incompatible # github.com/moby/buildkit v0.23.2 # github.com/docker/buildx v0.25.0 -# github.com/docker/cli v28.3.1+incompatible +# github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible # github.com/docker/compose/v2 v2.38.2 # github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2 -# github.com/docker/scout-cli v1.15.0 +# github.com/docker/scout-cli v1.18.1 diff --git a/content/manuals/admin/organization/insights.md b/content/manuals/admin/organization/insights.md index 7d62e416a7f..0c350e5c242 100644 --- a/content/manuals/admin/organization/insights.md +++ b/content/manuals/admin/organization/insights.md @@ -29,11 +29,11 @@ To use Insights, you must meet the following requirements: - [Docker Business subscription](../../subscription/details.md#docker-business) - Administrators must [enforce sign-in](/security/for-admins/enforce-sign-in/) for users -- Your Customer Success Manager must turn on Insights for your organization +- Your Account Executive must turn on Insights for your organization ## View Insights for organization users -To access Insights, contact your Customer Success Manager to have the +To access Insights, contact your Account Executive to have the feature turned on. Once the feature is turned on, access Insights using the following steps: diff --git a/content/manuals/engine/storage/volumes.md b/content/manuals/engine/storage/volumes.md index a62ca6f0fac..bc0eef21b4a 100644 --- a/content/manuals/engine/storage/volumes.md +++ b/content/manuals/engine/storage/volumes.md @@ -625,7 +625,7 @@ $ docker volume create \ --opt type=cifs \ --opt device=//uxxxxx.your-server.de/backup \ --opt o=addr=uxxxxx.your-server.de,username=uxxxxxxx,password=*****,file_mode=0777,dir_mode=0777 \ - --name cif-volume + --name cifs-volume ``` The `addr` option is required if you specify a hostname instead of an IP. diff --git a/content/manuals/offload/_index.md b/content/manuals/offload/_index.md index 60578f82003..cea38736559 100644 --- a/content/manuals/offload/_index.md +++ b/content/manuals/offload/_index.md @@ -42,6 +42,11 @@ grid: icon: bug_report link: /offload/troubleshoot/ +- title: Feedback + description: Provide feedback on Docker Offload. + icon: feedback + link: /offload/feedback/ + aliases: - /harmonia/ --- diff --git a/content/manuals/offload/feedback.md b/content/manuals/offload/feedback.md new file mode 100644 index 00000000000..ed73320fd4b --- /dev/null +++ b/content/manuals/offload/feedback.md @@ -0,0 +1,35 @@ +--- +description: Find a way to provide feedback that's right for you +keywords: Feedback, Docker Offload, bugs, problems, issues +title: Give feedback +weight: 900 +--- + +There are several ways you can provide feedback on Docker Offload. + +### In-product feedback + +On each Docker Desktop Dashboard view, there is a **Give feedback** link. This +opens a feedback form where you can share ideas directly with the Docker team. + +You can use the form for any type of feedback, including: + +- Report unexpected behavior +- Suggest improvements to Offload +- Share what's working well for you +- Describe how Offload integrates into your workflow and supports your development process + +### Report bugs or problems on GitHub + +To report bugs or problems, visit: +- [Docker Desktop for Mac issues on +GitHub](https://github.com/docker/for-mac/issues) +- [Docker Desktop for Windows issues on GitHub](https://github.com/docker/for-win/issues) +- [Docker Desktop for Linux issues on +GitHub](https://github.com/docker/desktop-linux/issues) + +### Suggest features or ideas + +To suggest new features or improvements, visit the [Docker Public +Roadmap](https://github.com/docker/roadmap/discussions). You can browse existing +ideas, vote on what matters to you, or open a new discussion. diff --git a/content/manuals/offload/troubleshoot.md b/content/manuals/offload/troubleshoot.md index 359b4e2289b..802063cb038 100644 --- a/content/manuals/offload/troubleshoot.md +++ b/content/manuals/offload/troubleshoot.md @@ -1,7 +1,7 @@ --- title: Troubleshoot Docker Offload linktitle: Troubleshoot -weight: 999 +weight: 800 description: Learn how to troubleshoot issues with Docker Offload. keywords: cloud, troubleshooting, cloud mode, Docker Desktop, cloud builder, usage tags: [Troubleshooting] diff --git a/data/engine-cli/docker_container_run.yaml b/data/engine-cli/docker_container_run.yaml index 39d2d106edd..2618bc43de2 100644 --- a/data/engine-cli/docker_container_run.yaml +++ b/data/engine-cli/docker_container_run.yaml @@ -1915,15 +1915,14 @@ examples: |- #### CDI devices - > [!NOTE] - > The CDI feature is experimental, and potentially subject to change. - > CDI is currently only supported for Linux containers. - [Container Device Interface (CDI)](https://github.com/cncf-tags/container-device-interface/blob/main/SPEC.md) is a standardized mechanism for container runtimes to create containers which are able to interact with third party devices. + CDI is currently only supported for Linux containers and is enabled by default + since Docker Engine 28.3.0. + With CDI, device configurations are declaratively defined using a JSON or YAML file. In addition to enabling the container to interact with the device node, it also lets you specify additional configuration for the device, such as @@ -1944,7 +1943,7 @@ examples: |- available on the system running the daemon, in one of the configured CDI specification directories. - The CDI feature has been enabled in the daemon; see [Enable CDI - devices](/reference/cli/dockerd/#enable-cdi-devices). + devices](/reference/cli/dockerd/#configure-cdi-devices). ### Attach to STDIN/STDOUT/STDERR (-a, --attach) {#attach} diff --git a/go.mod b/go.mod index aa770c3d62d..0f7edf39e78 100644 --- a/go.mod +++ b/go.mod @@ -4,20 +4,20 @@ go 1.24.0 require ( github.com/docker/buildx v0.25.0 // indirect - github.com/docker/cli v28.3.1+incompatible // indirect + github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible // indirect github.com/docker/compose/v2 v2.38.2 // indirect github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2 // indirect - github.com/docker/scout-cli v1.15.0 // indirect + github.com/docker/scout-cli v1.18.1 // indirect github.com/moby/buildkit v0.23.2 // indirect github.com/moby/moby v28.3.2+incompatible // indirect ) replace ( github.com/docker/buildx => github.com/docker/buildx v0.25.0 - github.com/docker/cli => github.com/docker/cli v28.3.0+incompatible + github.com/docker/cli => github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.38.2 github.com/docker/model-cli => github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2 - github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 + github.com/docker/scout-cli => github.com/docker/scout-cli v1.18.1 github.com/moby/buildkit => github.com/moby/buildkit v0.23.2 github.com/moby/moby => github.com/moby/moby v28.3.2+incompatible ) diff --git a/go.sum b/go.sum index bf12dd92392..b6bb6c8374d 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,8 @@ github.com/docker/cli v28.2.1+incompatible h1:AYyTcuwvhl9dXdyCiXlOGXiIqSNYzTmaDN github.com/docker/cli v28.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v28.3.0+incompatible h1:s+ttruVLhB5ayeuf2BciwDVxYdKi+RoUlxmwNHV3Vfo= github.com/docker/cli v28.3.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible h1:5I561JBDi4n0RKxYNkUVc9xiLnlCfjjm31XRV0r3o98= +github.com/docker/cli v28.3.3-0.20250711132746-c69d8bde4adc+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/compose/v2 v2.36.2 h1:rxk1PUUbhbAS6HkGsYo9xUmMBpKtVwFMNCQjE4+i5fk= github.com/docker/compose/v2 v2.36.2/go.mod h1:mZygkne+MAMu/e1B28PBFmG0Z0WefbxZ/IpcjSFdrw8= github.com/docker/compose/v2 v2.37.0 h1:R8Yik9ssiRz7T9BRfdOZy0xHDzOFPIJX40DrxzJ62dQ= @@ -78,6 +80,8 @@ github.com/docker/model-runner v0.0.0-20250627142917-26a0a73fbbc0 h1:yajuhlGe1xh github.com/docker/model-runner v0.0.0-20250627142917-26a0a73fbbc0/go.mod h1:vZJiUZH/7O1CyNsEGi1o4khUT4DVRjcwluuamU9fhuM= github.com/docker/scout-cli v1.15.0 h1:VhA9niVftEyZ9f5KGwKnrSfQOp2X3uIU3VbE/gTVMTM= github.com/docker/scout-cli v1.15.0/go.mod h1:Eo1RyCJsx3ldz/YTY5yGxu9g9mwTYbRUutxQUkow3Fc= +github.com/docker/scout-cli v1.18.1 h1:snFodhV6xFJryxdUZ0ukPZFZZFnWAGLUuuPZGB3BOK8= +github.com/docker/scout-cli v1.18.1/go.mod h1:Eo1RyCJsx3ldz/YTY5yGxu9g9mwTYbRUutxQUkow3Fc= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= diff --git a/layouts/partials/admonitions/icons/important.svg b/layouts/partials/admonitions/icons/important.svg index 66c0b33b17d..80386b920d6 100644 --- a/layouts/partials/admonitions/icons/important.svg +++ b/layouts/partials/admonitions/icons/important.svg @@ -1,8 +1,3 @@ - - - - - - +