Merge e0b53fd into 01e0b04

docker · Oct 18, 2024 · 787576d · 787576d
2 parents 01e0b04 + e0b53fd
commit 787576d
Showing 12 changed files with 17 additions and 16 deletions.
diff --git a/dist/docker-scout_1.14.0_checksums.txt b/dist/docker-scout_1.14.0_checksums.txt
diff --git a/dist/docker-scout_1.14.0_linux_arm64.tar.gz b/dist/docker-scout_1.14.0_linux_arm64.tar.gz
diff --git a/dist/docker-scout_1.15.0_checksums.txt b/dist/docker-scout_1.15.0_checksums.txt
@@ -0,0 +1,6 @@
+2f77db726a15d0c3e2607c34cf8fe5f82c26d1d2cd63d8ec30e8f7dc669612a1  docker-scout_1.15.0_darwin_amd64.tar.gz
+e5267f2cf2e41545f5661e7c2e8598a5f51bb8bbc9ef946b97047a526a10fdd1  docker-scout_1.15.0_darwin_arm64.tar.gz
+9dd20de30124cf88126d9c8798742916daec2ac7b26a57b3b20f62648f1eb44b  docker-scout_1.15.0_linux_amd64.tar.gz
+fff9834899a6e1a45aaa18a03b0b079baad64c83ea5027000b59b5424bc10638  docker-scout_1.15.0_linux_arm64.tar.gz
+28d9be52d4e4197471f002fd0a5697a71ed077a21c154b3d81274de65661fe3b  docker-scout_1.15.0_windows_amd64.zip
+5c8148c07b82de7c1afdb22862e0cc79bc69a836c34fc1c428f2404fa4d6b57a  docker-scout_1.15.0_windows_arm64.zip
diff --git a/dist/docker-scout_1.14.0_windows_amd64.zip → dist/docker-scout_1.15.0_darwin_amd64.tar.gz b/dist/docker-scout_1.14.0_windows_amd64.zip → dist/docker-scout_1.15.0_darwin_amd64.tar.gz
diff --git a/dist/docker-scout_1.14.0_linux_amd64.tar.gz → dist/docker-scout_1.15.0_darwin_arm64.tar.gz b/dist/docker-scout_1.14.0_linux_amd64.tar.gz → dist/docker-scout_1.15.0_darwin_arm64.tar.gz
diff --git a/dist/docker-scout_1.14.0_darwin_amd64.tar.gz → dist/docker-scout_1.15.0_linux_amd64.tar.gz b/dist/docker-scout_1.14.0_darwin_amd64.tar.gz → dist/docker-scout_1.15.0_linux_amd64.tar.gz
diff --git a/dist/docker-scout_1.14.0_windows_arm64.zip → dist/docker-scout_1.15.0_linux_arm64.tar.gz b/dist/docker-scout_1.14.0_windows_arm64.zip → dist/docker-scout_1.15.0_linux_arm64.tar.gz
diff --git a/dist/docker-scout_1.15.0_windows_amd64.zip b/dist/docker-scout_1.15.0_windows_amd64.zip
diff --git a/dist/docker-scout_1.14.0_darwin_arm64.tar.gz → dist/docker-scout_1.15.0_windows_arm64.zip b/dist/docker-scout_1.14.0_darwin_arm64.tar.gz → dist/docker-scout_1.15.0_windows_arm64.zip
diff --git a/docs/docker_scout_sbom.yaml b/docs/docker_scout_sbom.yaml
@@ -44,6 +44,7 @@ options:
         - list: list of packages of the image
         - json: json representation of the SBOM
         - spdx: spdx representation of the SBOM
+        - cyclonedx: cyclone dx representation of the SBOM
       deprecated: false
       hidden: false
       experimental: false

diff --git a/docs/scout_cves.md b/docs/scout_cves.md
@@ -264,8 +264,8 @@ pkg:apk/alpine/zlib@1.2.12-r1?arch=aarch64&distro=alpine-3.16.1
     ...
 
 11 vulnerabilities found in 2 packages
-  LOW       0
-  MEDIUM    8
-  HIGH      2
   CRITICAL  1
+  HIGH      2
+  MEDIUM    8
+  LOW       0
 ```
diff --git a/docs/scout_sbom.md b/docs/scout_sbom.md
@@ -5,13 +5,13 @@ Generate or display SBOM of an image
 
 ### Options
 
-| Name                  | Type          | Default | Description                                                                                                                                   |
-|:----------------------|:--------------|:--------|:----------------------------------------------------------------------------------------------------------------------------------------------|
-| `--format`            | `string`      | `json`  | Output format:<br>- list: list of packages of the image<br>- json: json representation of the SBOM<br>- spdx: spdx representation of the SBOM |
-| `--only-package-type` | `stringSlice` |         | Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc)<br>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.<br>Can only be used with archive                                       |
+| Name                  | Type          | Default | Description                                                                                                                                                                                         |
+|:----------------------|:--------------|:--------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `--format`            | `string`      | `json`  | Output format:<br>- list: list of packages of the image<br>- json: json representation of the SBOM<br>- spdx: spdx representation of the SBOM<br>- cyclonedx: cyclone dx representation of the SBOM |
+| `--only-package-type` | `stringSlice` |         | Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc)<br>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.<br>Can only be used with archive                                                                                             |
 
 
 <!---MARKER_GEN_END-->