Resolve Concelier/Excititor merge conflicts

2025-10-20 14:19:25 +03:00
parent 6ff35cd50a a07f46231b
commit 01104cccdf
2687 changed files with 212646 additions and 85913 deletions
--- a/samples/scanner/images/nginx/inventory.cdx.json
+++ b/samples/scanner/images/nginx/inventory.cdx.json
@@ -0,0 +1,53 @@
+{
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.5",
+  "version": 1,
+  "metadata": {
+    "timestamp": "2025-10-19T00:00:00Z",
+    "component": {
+      "type": "container",
+      "name": "nginx",
+      "version": "1.25.4",
+      "bomRef": "pkg:docker/library/nginx@sha256:8f47d7c6b538c0d9533b78913cba3d5e671e7c4b4e7c6a2bb9a1a1c4d4f8e123"
+    },
+    "tools": [
+      {
+        "name": "StellaOps Scanner",
+        "version": "10.0.0-preview1"
+      }
+    ]
+  },
+  "components": [
+    {
+      "type": "application",
+      "bomRef": "pkg:apk/alpine/nginx@1.25.4-r1?arch=x86_64",
+      "name": "nginx",
+      "version": "1.25.4-r1",
+      "licenses": [
+        {
+          "license": {
+            "id": "2BSD"
+          }
+        }
+      ]
+    },
+    {
+      "type": "library",
+      "bomRef": "pkg:apk/alpine/openssl@3.2.2-r0?arch=x86_64",
+      "name": "openssl",
+      "version": "3.2.2-r0"
+    },
+    {
+      "type": "library",
+      "bomRef": "pkg:apk/alpine/pcre2@10.42-r1?arch=x86_64",
+      "name": "pcre2",
+      "version": "10.42-r1"
+    },
+    {
+      "type": "library",
+      "bomRef": "pkg:apk/alpine/zlib@1.3-r2?arch=x86_64",
+      "name": "zlib",
+      "version": "1.3-r2"
+    }
+  ]
+}