diff --git a/dist/docker-scout_1.6.1_checksums.txt b/dist/docker-scout_1.6.1_checksums.txt deleted file mode 100644 index 9f43aaf..0000000 --- a/dist/docker-scout_1.6.1_checksums.txt +++ /dev/null @@ -1,6 +0,0 @@ -b7b494202ca2b798f36eb76a8b79e74496287f1864c885ce5bf9b473835b45bb docker-scout_1.6.1_darwin_amd64.tar.gz -362bf375cc959d1b6fdbbf5b42d3ea7dc3775c6d5f1691882a140845b66392f3 docker-scout_1.6.1_darwin_arm64.tar.gz -6d8f33fa330c2772fcf083ece5c59f6a9f0b8756932ab064a9144e378ea4fcc4 docker-scout_1.6.1_linux_amd64.tar.gz -4abae0000ae88efe68bcda6c1b9aca1a703eedbd59235df69282ba09747b0f96 docker-scout_1.6.1_linux_arm64.tar.gz -818f3791180c8b45193ec69340c1188b7646b711ed28a04c958166d820487a78 docker-scout_1.6.1_windows_amd64.zip -7f0e1b6b15b7fefbe4b5d77fa717fa64d3d994824c8d1b72ea35421372e58fcb docker-scout_1.6.1_windows_arm64.zip diff --git a/dist/docker-scout_1.6.2_checksums.txt b/dist/docker-scout_1.6.2_checksums.txt new file mode 100644 index 0000000..428b0d9 --- /dev/null +++ b/dist/docker-scout_1.6.2_checksums.txt @@ -0,0 +1,6 @@ +6da04a6257c78603248c24df356c7975199b8b5893a0a4505d241d70e35bd2c1 docker-scout_1.6.2_darwin_amd64.tar.gz +329f41767972f3769e5a6352ac720d50a21d2d2a7288ce07e71372842af4290e docker-scout_1.6.2_darwin_arm64.tar.gz +98e302fd87de0ec9dd3514eb508065849c2df07209fc5eaf5d56c7527db63fe1 docker-scout_1.6.2_linux_amd64.tar.gz +4f6eef07d9203831b8821179541cf103af26d1306d2fc3b414ae9f10767aa3fa docker-scout_1.6.2_linux_arm64.tar.gz +6de982cf880fb4c85597dfb11ea593ee0b3643f7e4fab7183e8d59b26beaa5b0 docker-scout_1.6.2_windows_amd64.zip +d517e37411d9b97207ab54d5e132d516b8cf3ae0902290ff08cb62d4e5ff7745 docker-scout_1.6.2_windows_arm64.zip diff --git a/dist/docker-scout_1.6.1_darwin_amd64.tar.gz b/dist/docker-scout_1.6.2_darwin_amd64.tar.gz similarity index 69% rename from dist/docker-scout_1.6.1_darwin_amd64.tar.gz rename to dist/docker-scout_1.6.2_darwin_amd64.tar.gz index 1f591d9..2bbac16 100644 Binary files a/dist/docker-scout_1.6.1_darwin_amd64.tar.gz and b/dist/docker-scout_1.6.2_darwin_amd64.tar.gz differ diff --git a/dist/docker-scout_1.6.1_darwin_arm64.tar.gz b/dist/docker-scout_1.6.2_darwin_arm64.tar.gz similarity index 68% rename from dist/docker-scout_1.6.1_darwin_arm64.tar.gz rename to dist/docker-scout_1.6.2_darwin_arm64.tar.gz index 9845b97..3bdfe26 100644 Binary files a/dist/docker-scout_1.6.1_darwin_arm64.tar.gz and b/dist/docker-scout_1.6.2_darwin_arm64.tar.gz differ diff --git a/dist/docker-scout_1.6.1_linux_amd64.tar.gz b/dist/docker-scout_1.6.2_linux_amd64.tar.gz similarity index 68% rename from dist/docker-scout_1.6.1_linux_amd64.tar.gz rename to dist/docker-scout_1.6.2_linux_amd64.tar.gz index c5f802b..e359b39 100644 Binary files a/dist/docker-scout_1.6.1_linux_amd64.tar.gz and b/dist/docker-scout_1.6.2_linux_amd64.tar.gz differ diff --git a/dist/docker-scout_1.6.1_linux_arm64.tar.gz b/dist/docker-scout_1.6.2_linux_arm64.tar.gz similarity index 67% rename from dist/docker-scout_1.6.1_linux_arm64.tar.gz rename to dist/docker-scout_1.6.2_linux_arm64.tar.gz index a451952..e585720 100644 Binary files a/dist/docker-scout_1.6.1_linux_arm64.tar.gz and b/dist/docker-scout_1.6.2_linux_arm64.tar.gz differ diff --git a/dist/docker-scout_1.6.1_windows_amd64.zip b/dist/docker-scout_1.6.2_windows_amd64.zip similarity index 69% rename from dist/docker-scout_1.6.1_windows_amd64.zip rename to dist/docker-scout_1.6.2_windows_amd64.zip index 2bf362f..893bf1f 100644 Binary files a/dist/docker-scout_1.6.1_windows_amd64.zip and b/dist/docker-scout_1.6.2_windows_amd64.zip differ diff --git a/dist/docker-scout_1.6.1_windows_arm64.zip b/dist/docker-scout_1.6.2_windows_arm64.zip similarity index 67% rename from dist/docker-scout_1.6.1_windows_arm64.zip rename to dist/docker-scout_1.6.2_windows_arm64.zip index 999be2b..a4f6556 100644 Binary files a/dist/docker-scout_1.6.1_windows_arm64.zip and b/dist/docker-scout_1.6.2_windows_arm64.zip differ diff --git a/docs/docker_scout_cache_prune.yaml b/docs/docker_scout_cache_prune.yaml index 7c0bb10..2d5f7de 100644 --- a/docs/docker_scout_cache_prune.yaml +++ b/docs/docker_scout_cache_prune.yaml @@ -9,16 +9,6 @@ usage: docker scout cache prune pname: docker scout cache plink: docker_scout_cache.yaml options: - - option: epss - value_type: bool - default_value: "false" - description: Prune cached EPSS scores - deprecated: false - hidden: false - experimental: false - experimentalcli: false - kubernetes: false - swarm: false - option: force shorthand: f value_type: bool diff --git a/docs/docker_scout_cves.yaml b/docs/docker_scout_cves.yaml index 76fd9e1..639e0fe 100644 --- a/docs/docker_scout_cves.yaml +++ b/docs/docker_scout_cves.yaml @@ -64,15 +64,6 @@ options: experimentalcli: false kubernetes: false swarm: false - - option: epss-date - value_type: string - description: Date to use for EPSS scores - deprecated: false - hidden: false - experimental: false - experimentalcli: false - kubernetes: false - swarm: false - option: epss-percentile value_type: float32 default_value: "0" @@ -109,7 +100,13 @@ options: - option: format value_type: string default_value: packages - description: "Output format of the generated vulnerability report:\n- packages: default output, plain text with vulnerabilities grouped by packages\n- sarif: json Sarif output\n- spdx: json SPDX output \n- markdown: markdown output (including some html tags like collapsible sections)\n- sbom: json SBOM output" + description: |- + Output format of the generated vulnerability report: + - packages: default output, plain text with vulnerabilities grouped by packages + - sarif: json Sarif output + - spdx: json SPDX output + - markdown: markdown output (including some html tags like collapsible sections) + - sbom: json SBOM output deprecated: false hidden: false experimental: false diff --git a/docs/docker_scout_push.yaml b/docs/docker_scout_push.yaml index 3c31753..4b1370c 100644 --- a/docs/docker_scout_push.yaml +++ b/docs/docker_scout_push.yaml @@ -34,6 +34,15 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: platform + value_type: string + description: Platform of image to be pushed + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: sbom value_type: bool default_value: "false" diff --git a/docs/scout_cache_prune.md b/docs/scout_cache_prune.md index f53a512..7292884 100644 --- a/docs/scout_cache_prune.md +++ b/docs/scout_cache_prune.md @@ -7,7 +7,6 @@ Remove temporary or cached data | Name | Type | Default | Description | |:----------------|:-----|:--------|:-------------------------------| -| `--epss` | | | Prune cached EPSS scores | | `-f`, `--force` | | | Do not prompt for confirmation | | `--sboms` | | | Prune cached SBOMs | diff --git a/docs/scout_cves.md b/docs/scout_cves.md index 3b5c19c..c8ddf73 100644 --- a/docs/scout_cves.md +++ b/docs/scout_cves.md @@ -9,35 +9,34 @@ Display CVEs identified in a software artifact ### Options -| Name | Type | Default | Description | -|:-----------------------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `--details` | | | Print details on default text output | -| `--env` | `string` | | Name of environment | -| [`--epss`](#epss) | | | Display the EPSS scores and organize the package's CVEs according to their EPSS score | -| `--epss-date` | `string` | | Date to use for EPSS scores | -| `--epss-percentile` | `float32` | `0` | Exclude CVEs with EPSS scores less than the specified percentile (0 to 1) | -| `--epss-score` | `float32` | `0` | Exclude CVEs with EPSS scores less than the specified value (0 to 1) | -| `-e`, `--exit-code` | | | Return exit code '2' if vulnerabilities are detected | -| `--format` | `string` | `packages` | Output format of the generated vulnerability report:
- packages: default output, plain text with vulnerabilities grouped by packages
- sarif: json Sarif output
- spdx: json SPDX output
- markdown: markdown output (including some html tags like collapsible sections)
- sbom: json SBOM output
| -| `--ignore-base` | | | Filter out CVEs introduced from base image | -| `--locations` | | | Print package locations including file paths and layer diff_id | -| `--multi-stage` | | | Show packages from multi-stage Docker builds | -| `--only-cve-id` | `stringSlice` | | Comma separated list of CVE ids (like CVE-2021-45105) to search for | -| `--only-fixed` | | | Filter to fixable CVEs | -| `--only-metric` | `stringSlice` | | Comma separated list of CVSS metrics (like AV:N or PR:L) to filter CVEs by | -| `--only-package` | `stringSlice` | | Comma separated regular expressions to filter packages by | -| `--only-package-type` | `stringSlice` | | Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc) | -| `--only-severity` | `stringSlice` | | Comma separated list of severities (critical, high, medium, low, unspecified) to filter CVEs by | -| `--only-stage` | `stringSlice` | | Comma separated list of multi-stage Docker build stage names | -| `--only-unfixed` | | | Filter to unfixed CVEs | -| `--only-vex-affected` | | | Filter CVEs by VEX statements with status not affected | -| `--only-vuln-packages` | | | When used with --format=only-packages ignore packages with no vulnerabilities | -| `--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 archive | -| `--vex-author` | `stringSlice` | | List of VEX statement authors to accept | -| `--vex-location` | `stringSlice` | | File location of directory or file containing VEX statements | +| Name | Type | Default | Description | +|:-----------------------|:--------------|:-----------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `--details` | | | Print details on default text output | +| `--env` | `string` | | Name of environment | +| [`--epss`](#epss) | | | Display the EPSS scores and organize the package's CVEs according to their EPSS score | +| `--epss-percentile` | `float32` | `0` | Exclude CVEs with EPSS scores less than the specified percentile (0 to 1) | +| `--epss-score` | `float32` | `0` | Exclude CVEs with EPSS scores less than the specified value (0 to 1) | +| `-e`, `--exit-code` | | | Return exit code '2' if vulnerabilities are detected | +| `--format` | `string` | `packages` | Output format of the generated vulnerability report:
- packages: default output, plain text with vulnerabilities grouped by packages
- sarif: json Sarif output
- spdx: json SPDX output
- markdown: markdown output (including some html tags like collapsible sections)
- sbom: json SBOM output
| +| `--ignore-base` | | | Filter out CVEs introduced from base image | +| `--locations` | | | Print package locations including file paths and layer diff_id | +| `--multi-stage` | | | Show packages from multi-stage Docker builds | +| `--only-cve-id` | `stringSlice` | | Comma separated list of CVE ids (like CVE-2021-45105) to search for | +| `--only-fixed` | | | Filter to fixable CVEs | +| `--only-metric` | `stringSlice` | | Comma separated list of CVSS metrics (like AV:N or PR:L) to filter CVEs by | +| `--only-package` | `stringSlice` | | Comma separated regular expressions to filter packages by | +| `--only-package-type` | `stringSlice` | | Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc) | +| `--only-severity` | `stringSlice` | | Comma separated list of severities (critical, high, medium, low, unspecified) to filter CVEs by | +| `--only-stage` | `stringSlice` | | Comma separated list of multi-stage Docker build stage names | +| `--only-unfixed` | | | Filter to unfixed CVEs | +| `--only-vex-affected` | | | Filter CVEs by VEX statements with status not affected | +| `--only-vuln-packages` | | | When used with --format=only-packages ignore packages with no vulnerabilities | +| `--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 archive | +| `--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/docs/scout_push.md b/docs/scout_push.md index 4517438..6ddfeda 100644 --- a/docs/scout_push.md +++ b/docs/scout_push.md @@ -10,6 +10,7 @@ Push an image or image index to Docker Scout (experimental) | `--author` | `string` | | Name of the author of the image | | `--org` | `string` | | Namespace of the Docker organization to which image will be pushed | | `-o`, `--output` | `string` | | Write the report to a file | +| `--platform` | `string` | | Platform of image to be pushed | | `--sbom` | | | Create and upload SBOMs | | `--timestamp` | `string` | | Timestamp of image or tag creation |