Merge fce1856 into 5a91d66

docker · Mar 21, 2024 · 0d631aa · 0d631aa
2 parents 5a91d66 + fce1856
commit 0d631aa
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 56 deletions.
diff --git a/dist/docker-scout_1.6.1_checksums.txt b/dist/docker-scout_1.6.1_checksums.txt
diff --git a/dist/docker-scout_1.6.2_checksums.txt 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 → dist/docker-scout_1.6.2_darwin_amd64.tar.gz b/dist/docker-scout_1.6.1_darwin_amd64.tar.gz → dist/docker-scout_1.6.2_darwin_amd64.tar.gz
diff --git a/dist/docker-scout_1.6.1_darwin_arm64.tar.gz → dist/docker-scout_1.6.2_darwin_arm64.tar.gz b/dist/docker-scout_1.6.1_darwin_arm64.tar.gz → dist/docker-scout_1.6.2_darwin_arm64.tar.gz
diff --git a/dist/docker-scout_1.6.1_linux_amd64.tar.gz → dist/docker-scout_1.6.2_linux_amd64.tar.gz b/dist/docker-scout_1.6.1_linux_amd64.tar.gz → dist/docker-scout_1.6.2_linux_amd64.tar.gz
diff --git a/dist/docker-scout_1.6.1_linux_arm64.tar.gz → dist/docker-scout_1.6.2_linux_arm64.tar.gz b/dist/docker-scout_1.6.1_linux_arm64.tar.gz → dist/docker-scout_1.6.2_linux_arm64.tar.gz
diff --git a/dist/docker-scout_1.6.1_windows_amd64.zip → dist/docker-scout_1.6.2_windows_amd64.zip b/dist/docker-scout_1.6.1_windows_amd64.zip → dist/docker-scout_1.6.2_windows_amd64.zip
diff --git a/dist/docker-scout_1.6.1_windows_arm64.zip → dist/docker-scout_1.6.2_windows_arm64.zip b/dist/docker-scout_1.6.1_windows_arm64.zip → dist/docker-scout_1.6.2_windows_arm64.zip
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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                                 |