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/alpine-busybox/usage.cdx.json
+++ b/samples/scanner/images/alpine-busybox/usage.cdx.json
@@ -0,0 +1,28 @@
+{
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.5",
+  "version": 1,
+  "metadata": {
+    "timestamp": "2025-10-19T00:00:00Z",
+    "component": {
+      "type": "container",
+      "name": "alpine-busybox",
+      "version": "3.20",
+      "bomRef": "pkg:docker/library/alpine@sha256:9a214327ec7df5bc8f1d3f12171873be7d778fdbf473d6f9a63d5de6c6bfb2d3"
+    }
+  },
+  "components": [
+    {
+      "type": "application",
+      "bomRef": "pkg:apk/alpine/busybox@1.36.1-r2?arch=x86_64",
+      "name": "busybox",
+      "version": "1.36.1-r2"
+    },
+    {
+      "type": "library",
+      "bomRef": "pkg:apk/alpine/musl@1.2.5-r0?arch=x86_64",
+      "name": "musl",
+      "version": "1.2.5-r0"
+    }
+  ]
+}