Merge 6229fbd into 2c263df

docker · Jul 15, 2024 · 2be4dde · 2be4dde
2 parents 2c263df + 6229fbd
commit 2be4dde
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 10 deletions.
diff --git a/dist/docker-scout_1.10.0_checksums.txt b/dist/docker-scout_1.10.0_checksums.txt
diff --git a/dist/docker-scout_1.11.0_checksums.txt b/dist/docker-scout_1.11.0_checksums.txt
@@ -0,0 +1,6 @@
+72174417412d99bdb07251717c2908aa8bfdec58eaf3855fa968528d6a788fe8  docker-scout_1.11.0_darwin_amd64.tar.gz
+a52d360d2f7b33a3916aed7eaf9d0dc08c1e15dcb4140e98ee7d3ebf79980686  docker-scout_1.11.0_darwin_arm64.tar.gz
+892b1fd5d7259625750aaaa8497f1a146386d8c6a3a67ed4984263cd873dbadc  docker-scout_1.11.0_linux_amd64.tar.gz
+a5c2abc8a91e1b1694670ee59345888bedf80998fe825f46639a42ca9324f861  docker-scout_1.11.0_linux_arm64.tar.gz
+0731700a92e9cf3e73c35c41a85ab865f9fe584111769d36e6496508816b3344  docker-scout_1.11.0_windows_amd64.zip
+4f12eeb2317847d49324fe8b2d3b19c301927ef9084ff05ce9a6077b75f34e6e  docker-scout_1.11.0_windows_arm64.zip
diff --git a/dist/docker-scout_1.10.0_windows_amd64.zip → dist/docker-scout_1.11.0_darwin_amd64.tar.gz b/dist/docker-scout_1.10.0_windows_amd64.zip → dist/docker-scout_1.11.0_darwin_amd64.tar.gz
diff --git a/dist/docker-scout_1.10.0_darwin_arm64.tar.gz → dist/docker-scout_1.11.0_darwin_arm64.tar.gz b/dist/docker-scout_1.10.0_darwin_arm64.tar.gz → dist/docker-scout_1.11.0_darwin_arm64.tar.gz
diff --git a/dist/docker-scout_1.10.0_darwin_amd64.tar.gz → dist/docker-scout_1.11.0_linux_amd64.tar.gz b/dist/docker-scout_1.10.0_darwin_amd64.tar.gz → dist/docker-scout_1.11.0_linux_amd64.tar.gz
diff --git a/dist/docker-scout_1.10.0_windows_arm64.zip → dist/docker-scout_1.11.0_linux_arm64.tar.gz b/dist/docker-scout_1.10.0_windows_arm64.zip → dist/docker-scout_1.11.0_linux_arm64.tar.gz
diff --git a/dist/docker-scout_1.10.0_linux_amd64.tar.gz → dist/docker-scout_1.11.0_windows_amd64.zip b/dist/docker-scout_1.10.0_linux_amd64.tar.gz → dist/docker-scout_1.11.0_windows_amd64.zip
diff --git a/dist/docker-scout_1.10.0_linux_arm64.tar.gz → dist/docker-scout_1.11.0_windows_arm64.zip b/dist/docker-scout_1.10.0_linux_arm64.tar.gz → dist/docker-scout_1.11.0_windows_arm64.zip
diff --git a/docs/docker_scout_cves.yaml b/docs/docker_scout_cves.yaml
@@ -144,6 +144,16 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
+    - option: only-cisa-kev
+      value_type: bool
+      default_value: "false"
+      description: Filter to CVEs listed in the CISA KEV catalog
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
     - option: only-cve-id
       value_type: stringSlice
       default_value: '[]'

diff --git a/docs/docker_scout_push.yaml b/docs/docker_scout_push.yaml
@@ -1,5 +1,5 @@
 command: docker scout push
-short: Push an image or image index to Docker Scout (experimental)
+short: Push an image or image index to Docker Scout
 long: |
     The `docker scout push` command lets you push an image or analysis result to Docker Scout.
 usage: docker scout push IMAGE
@@ -15,6 +15,16 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
+    - option: dry-run
+      value_type: bool
+      default_value: "false"
+      description: Do not push the image but process it
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
     - option: org
       value_type: string
       description: Namespace of the Docker organization to which image will be pushed
@@ -91,7 +101,7 @@ examples: |-
     ```
 deprecated: false
 experimental: false
-experimentalcli: true
+experimentalcli: false
 kubernetes: false
 swarm: false
 
diff --git a/docs/scout.md b/docs/scout.md
@@ -22,7 +22,7 @@ Command line tool for Docker Scout
 | [`help`](scout_help.md)                                       | Display information about the available commands                                            |
 | [`integration`](scout_integration.md)                         | Commands to list, configure, and delete Docker Scout integrations                           |
 | [`policy`](scout_policy.md)                                   | Evaluate policies against an image and display the policy evaluation results (experimental) |
-| [`push`](scout_push.md)                                       | Push an image or image index to Docker Scout (experimental)                                 |
+| [`push`](scout_push.md)                                       | Push an image or image index to Docker Scout                                                |
 | [`quickview`](scout_quickview.md)                             | Quick overview of an image                                                                  |
 | [`recommendations`](scout_recommendations.md)                 | Display available base image updates and remediation recommendations                        |
 | [`repo`](scout_repo.md)                                       | Commands to list, enable, and disable Docker Scout on repositories                          |

diff --git a/docs/scout_cves.md b/docs/scout_cves.md
@@ -21,6 +21,7 @@ Display CVEs identified in a software artifact
 | `--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-cisa-kev`      |               |            | Filter to CVEs listed in the CISA KEV catalog                                                                                                                                                                                                                                                                                                         |
 | `--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                                                                                                                                                                                                                                                                            |

diff --git a/docs/scout_push.md b/docs/scout_push.md
@@ -1,13 +1,14 @@
 # docker scout push
 
 <!---MARKER_GEN_START-->
-Push an image or image index to Docker Scout (experimental)
+Push an image or image index to Docker Scout
 
 ### Options
 
 | Name             | Type     | Default | Description                                                        |
 |:-----------------|:---------|:--------|:-------------------------------------------------------------------|
 | `--author`       | `string` |         | Name of the author of the image                                    |
+| `--dry-run`      |          |         | Do not push the image but process it                               |
 | `--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                                     |