Skip to content

Commit 26d6f74

Browse files
fix(vector): Use relative path to patchable checked out source (#1471)
* fix(vector): Use relative path to patchable checked out source Fixes this error: ``` find: '/src/': No such file or directory ``` Because fot this build, WORKDIR is /stackable (so patchable checked out src/ is below that) * chore: Update changelog * fix: Correctly include SBOM Co-authored-by: Lukas Krug <lukas@luvosys.de> --------- Co-authored-by: Lukas Krug <lukas@luvosys.de>
1 parent c98be7e commit 26d6f74

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
1717

1818
- trino: Backport fix for wrong deletes in Delta Lake ([#1453]).
1919
- opensearch: Scope CycloneDX SBOM to shipped components only, eliminating false positive CVEs from unshipped plugins ([#1452]).
20+
- vector: Look for SBOM in correct location ([#1471]).
2021
- vector: Use correct license ([#1476]).
2122

2223
[#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.
2526
[#1454]: https://github.com/stackabletech/docker-images/pull/1454
2627
[#1463]: https://github.com/stackabletech/docker-images/pull/1463
2728
[#1466]: https://github.com/stackabletech/docker-images/pull/1466
29+
[#1471]: https://github.com/stackabletech/docker-images/pull/1471
2830
[#1474]: https://github.com/stackabletech/docker-images/pull/1474
2931
[#1476]: https://github.com/stackabletech/docker-images/pull/1476
3032

vector/copy_artifacts.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
cp "$1" /app
77

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

0 commit comments

Comments
 (0)