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 02c4145838..02b8943e46 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout.yaml @@ -11,7 +11,6 @@ cname: - docker scout cves - docker scout enroll - docker scout environment - - docker scout policy - docker scout quickview - docker scout recommendations - docker scout repo @@ -23,7 +22,6 @@ clink: - docker_scout_cves.yaml - docker_scout_enroll.yaml - docker_scout_environment.yaml - - docker_scout_policy.yaml - docker_scout_quickview.yaml - docker_scout_recommendations.yaml - docker_scout_repo.yaml 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 7c747d3068..ad27c7c9cd 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 @@ -231,6 +231,7 @@ options: - image - oci-dir - archive (docker save tarball) + - fs (directory or file) deprecated: false hidden: false experimental: false @@ -245,6 +246,7 @@ options: - image - oci-dir - archive (docker save tarball) + - fs (directory or file) 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 68f90f81c4..ea8a34bf3a 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 @@ -238,6 +238,7 @@ options: - image - oci-dir - archive (docker save tarball) + - fs (directory or file) deprecated: false hidden: false experimental: false diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_environment.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_environment.yaml index 43b7c082d1..79b56fa0c5 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_environment.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_environment.yaml @@ -9,15 +9,6 @@ usage: docker scout environment [ENVIRONMENT] [IMAGE] pname: docker scout plink: docker_scout.yaml options: - - option: app - value_type: string - description: Name of application the image is a part of - deprecated: false - hidden: false - experimental: false - experimentalcli: false - kubernetes: false - swarm: false - option: org value_type: string description: Namespace of the Docker organization diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_quickview.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_quickview.yaml index 79ab808157..b7c3cb403b 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_quickview.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_quickview.yaml @@ -76,6 +76,7 @@ options: - image - oci-dir - archive (docker save tarball) + - fs (directory or file) deprecated: false hidden: false experimental: false 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 624b168d41..8b7daab9de 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 @@ -89,6 +89,7 @@ options: - image - oci-dir - archive (docker save tarball) + - fs (directory or file) deprecated: false hidden: false experimental: false diff --git a/_vendor/github.com/docker/scout-cli/docs/docker_scout_stream.yaml b/_vendor/github.com/docker/scout-cli/docs/docker_scout_stream.yaml index b4e04a34a8..31a307c208 100644 --- a/_vendor/github.com/docker/scout-cli/docs/docker_scout_stream.yaml +++ b/_vendor/github.com/docker/scout-cli/docs/docker_scout_stream.yaml @@ -8,15 +8,6 @@ usage: docker scout stream [STREAM] [IMAGE] pname: docker scout plink: docker_scout.yaml options: - - option: app - value_type: string - description: Name of application the image is a part of - deprecated: false - hidden: false - experimental: false - experimentalcli: false - kubernetes: false - swarm: false - option: org value_type: string description: Namespace of the Docker organization 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 beaa976c37..da4cce5464 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_compare.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_compare.md @@ -29,8 +29,8 @@ Compare two images and display differences (experimental) | `--to-env` | `string` | | Name of environment to compare to | | `--to-latest` | | | Latest image processed to compare to | | `--to-ref` | `string` | | Reference to use if the provided tarball contains multiple references.
Can only be used with --type archive. | -| `--to-type` | `string` | `image` | Image type to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
| -| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
| +| `--to-type` | `string` | `image` | Image type to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
- fs (directory or file)
| +| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
- fs (directory or file)
| diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_cves.md b/_vendor/github.com/docker/scout-cli/docs/scout_cves.md index d388770526..b4bb7ab03c 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_cves.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_cves.md @@ -30,7 +30,7 @@ Display CVEs identified in a software artifact | `-o`, `--output` | `string` | | Write the report to a file. | | `--platform` | `string` | | Platform of image to analyze | | `--ref` | `string` | | Reference to use if the provided tarball contains multiple references.
Can only be used with --type archive. | -| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
| +| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
- fs (directory or file)
| | `--vex` | | | Apply VEX statements to filter CVEs | | `--vex-author` | `stringSlice` | | List of VEX statement authors to accept | | `--vex-location` | `stringSlice` | | File location of directory or file containing VEX statements | diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_environment.md b/_vendor/github.com/docker/scout-cli/docs/scout_environment.md index d9b3c49a54..818bb112d4 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_environment.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_environment.md @@ -9,12 +9,11 @@ Manage environments (experimental) ### Options -| Name | Type | Default | Description | -|:-----------------|:---------|:--------|:-------------------------------------------| -| `--app` | `string` | | Name of application the image is a part of | -| `--org` | `string` | | Namespace of the Docker organization | -| `-o`, `--output` | `string` | | Write the report to a file. | -| `--platform` | `string` | | Platform of image to record | +| Name | Type | Default | Description | +|:-----------------|:---------|:--------|:-------------------------------------| +| `--org` | `string` | | Namespace of the Docker organization | +| `-o`, `--output` | `string` | | Write the report to a file. | +| `--platform` | `string` | | Platform of image to record | diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_quickview.md b/_vendor/github.com/docker/scout-cli/docs/scout_quickview.md index 12a44a6a06..1d0f1b6694 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_quickview.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_quickview.md @@ -9,14 +9,14 @@ Quick overview of an image ### Options -| Name | Type | Default | Description | -|:-----------------|:---------|:--------|:----------------------------------------------------------------------------------------------------------------| -| `--env` | `string` | | Name of the environment | -| `--org` | `string` | | Namespace of the Docker organization | -| `-o`, `--output` | `string` | | Write the report to a file. | -| `--platform` | `string` | | Platform of image to analyze | -| `--ref` | `string` | | Reference to use if the provided tarball contains multiple references.
Can only be used with --type archive. | -| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
| +| Name | Type | Default | Description | +|:-----------------|:---------|:--------|:----------------------------------------------------------------------------------------------------------------------------------------| +| `--env` | `string` | | Name of the environment | +| `--org` | `string` | | Namespace of the Docker organization | +| `-o`, `--output` | `string` | | Write the report to a file. | +| `--platform` | `string` | | Platform of image to analyze | +| `--ref` | `string` | | Reference to use if the provided tarball contains multiple references.
Can only be used with --type archive. | +| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
- fs (directory or file)
| diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_sbom.md b/_vendor/github.com/docker/scout-cli/docs/scout_sbom.md index 660caa08f2..a69d9e0774 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_sbom.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_sbom.md @@ -5,14 +5,14 @@ Generate or display SBOM of an image ### Options -| Name | Type | Default | Description | -|:----------------------|:--------------|:--------|:--------------------------------------------------------------------------------------------------------------------------| -| `--format` | `string` | `json` | Output format:
- list: list of packages of the image
- json: json representation of the SBOM | -| `--only-package-type` | `stringSlice` | | Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc)
Can only be used with --format list | -| `-o`, `--output` | `string` | | Write the report to a file. | -| `--platform` | `string` | | Platform of image to analyze | -| `--ref` | `string` | | Reference to use if the provided tarball contains multiple references.
Can only be used with --type archive. | -| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
| +| Name | Type | Default | Description | +|:----------------------|:--------------|:--------|:----------------------------------------------------------------------------------------------------------------------------------------| +| `--format` | `string` | `json` | Output format:
- list: list of packages of the image
- json: json representation of the SBOM | +| `--only-package-type` | `stringSlice` | | Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc)
Can only be used with --format list | +| `-o`, `--output` | `string` | | Write the report to a file. | +| `--platform` | `string` | | Platform of image to analyze | +| `--ref` | `string` | | Reference to use if the provided tarball contains multiple references.
Can only be used with --type archive. | +| `--type` | `string` | `image` | Type of the image to analyze. Can be one of:
- image
- oci-dir
- archive (docker save tarball)
- fs (directory or file)
| diff --git a/_vendor/github.com/docker/scout-cli/docs/scout_stream.md b/_vendor/github.com/docker/scout-cli/docs/scout_stream.md index 6890f3d1b5..5fa86705fc 100644 --- a/_vendor/github.com/docker/scout-cli/docs/scout_stream.md +++ b/_vendor/github.com/docker/scout-cli/docs/scout_stream.md @@ -5,12 +5,11 @@ Manage streams (experimental) ### Options -| Name | Type | Default | Description | -|:-----------------|:---------|:--------|:-------------------------------------------| -| `--app` | `string` | | Name of application the image is a part of | -| `--org` | `string` | | Namespace of the Docker organization | -| `-o`, `--output` | `string` | | Write the report to a file. | -| `--platform` | `string` | | Platform of image to record | +| Name | Type | Default | Description | +|:-----------------|:---------|:--------|:-------------------------------------| +| `--org` | `string` | | Namespace of the Docker organization | +| `-o`, `--output` | `string` | | Write the report to a file. | +| `--platform` | `string` | | Platform of image to record | diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 7b44feca13..a4ff5b32f0 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/moby/moby v24.0.5+incompatible # github.com/moby/buildkit v0.12.1-0.20230830200556-05eb7287534b # github.com/docker/buildx v0.11.2 -# github.com/docker/scout-cli v0.23.3 +# github.com/docker/scout-cli v0.24.1 # github.com/docker/cli v24.0.5+incompatible # github.com/docker/compose-cli v1.0.35 # github.com/distribution/distribution v2.8.2+incompatible diff --git a/go.mod b/go.mod index b3203b0a42..4e34d9ca01 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/docker/cli v24.0.5+incompatible // indirect github.com/docker/compose-cli v1.0.35 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect + github.com/docker/scout-cli v0.24.1 // indirect github.com/moby/buildkit v0.12.1-0.20230830200556-05eb7287534b // indirect - github.com/docker/scout-cli v0.23.3 // indirect github.com/moby/moby v24.0.5+incompatible // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc4 // indirect diff --git a/go.sum b/go.sum index 3087ba9aea..2f76803e74 100644 --- a/go.sum +++ b/go.sum @@ -71,6 +71,8 @@ github.com/docker/scout-cli v0.23.0 h1:oFCNiO+11WhcnsXj3MF6uqJD49oBPMdJ3Pdq9XfZa github.com/docker/scout-cli v0.23.0/go.mod h1:Eo1RyCJsx3ldz/YTY5yGxu9g9mwTYbRUutxQUkow3Fc= github.com/docker/scout-cli v0.23.3 h1:ToQ/Gw1clQ2GJ47Yt0HCefJB55oPOHZYH6rVxGdfF7Y= github.com/docker/scout-cli v0.23.3/go.mod h1:Eo1RyCJsx3ldz/YTY5yGxu9g9mwTYbRUutxQUkow3Fc= +github.com/docker/scout-cli v0.24.1 h1:ga1J6dsKXfhBQ98wKbb+GWncuMdqErxhpLMxPSMqH+g= +github.com/docker/scout-cli v0.24.1/go.mod h1:Eo1RyCJsx3ldz/YTY5yGxu9g9mwTYbRUutxQUkow3Fc= github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=