Merge branch 'main' into nifi/flow-sync-patch

Author: adwk67

CHANGELOG.md

@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 
 - trino: Backport fix for wrong deletes in Delta Lake ([#1453]).
 - opensearch: Scope CycloneDX SBOM to shipped components only, eliminating false positive CVEs from unshipped plugins ([#1452]).
+- vector: Look for SBOM in correct location ([#1471]).
 - vector: Use correct license ([#1476]).
 
 [#1446]: https://github.com/stackabletech/docker-images/pull/1446
@@ -25,6 +26,7 @@ All notable changes to this project will be documented in this file.
 [#1454]: https://github.com/stackabletech/docker-images/pull/1454
 [#1463]: https://github.com/stackabletech/docker-images/pull/1463
 [#1466]: https://github.com/stackabletech/docker-images/pull/1466
+[#1471]: https://github.com/stackabletech/docker-images/pull/1471
 [#1474]: https://github.com/stackabletech/docker-images/pull/1474
 [#1476]: https://github.com/stackabletech/docker-images/pull/1476
 

vector/copy_artifacts.sh

@@ -6,5 +6,7 @@
 cp "$1" /app
 
 # And now try to find a BOM file named like the binary + _bin.cdx.xml and copy it over as well if it exists
+# Using `patchable with --images-repo-root=src` makes the path `/stackable/src/vector/patchable-work/worktree/0.52.0`
+# assuming WORKDIR was `/stackable`.
 base=$(basename "$1")
-find /src/ -type f -name "${base}_bin.cdx.xml" -exec cp {} /app \;
+find . -maxdepth 1 -type f -name "${base}_bin.cdx.xml" -exec cp {} /app \;