diff --git a/CHANGELOG.md b/CHANGELOG.md index e28ed6dab..a177f713d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file. - ci: Rename local actions, adjust action inputs and outputs, add definition README file ([#819]). +- Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783]) ### Removed @@ -35,6 +36,7 @@ All notable changes to this project will be documented in this file. - hbase: link to phoenix server jar ([#811]). +[#783]: https://github.com/stackabletech/docker-images/pull/783 [#797]: https://github.com/stackabletech/docker-images/pull/797 [#802]: https://github.com/stackabletech/docker-images/pull/802 [#809]: https://github.com/stackabletech/docker-images/pull/809 diff --git a/renovate.json b/renovate.json index 994b3f019..43b32fbd8 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "local>stackabletech/.github:renovate-config", + "github>stackabletech/.github:renovate-config", "docker:pinDigests" ] } diff --git a/shared/copy_artifacts.sh b/shared/copy_artifacts.sh index 79d98f860..e69c04215 100755 --- a/shared/copy_artifacts.sh +++ b/shared/copy_artifacts.sh @@ -3,6 +3,6 @@ # Copy over the binary cp "$1" /app -# And now try to find a BOM file named like the binary + .cdx.xml and copy it over as well if it exists +# And now try to find a BOM file named like the binary + _bin.cdx.xml and copy it over as well if it exists base=$(basename "$1") -find /src/rust/ -type f -name "$base.cdx.xml" -exec cp {} /app \; +find /src/rust/ -type f -name "${base}_bin.cdx.xml" -exec cp {} /app \; diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile index 1c3df61d1..6debab9f9 100644 --- a/stackable-base/Dockerfile +++ b/stackable-base/Dockerfile @@ -5,14 +5,17 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52 AS product-utils-builder # Find the latest version here: https://github.com/stackabletech/config-utils/tags +# renovate: datasource=github-tags packageName=stackabletech/config-utils ENV CONFIG_UTILS_VERSION=0.2.0 # This SHOULD be kept in sync with operator-templating and other tools to reduce build times # Find the latest version here: https://doc.rust-lang.org/stable/releases.html +# renovate: datasource=github-releases packageName=rust-lang/rust ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.80.1 # Find the latest version here: https://crates.io/crates/cargo-cyclonedx -# IMPORTANT: Do not update until https://github.com/stackabletech/docker-images/pull/783 is merged -ENV CARGO_CYCLONEDX_CRATE_VERSION=0.4.0 +# renovate: datasource=crate packageName=cargo-cyclonedx +ENV CARGO_CYCLONEDX_CRATE_VERSION=0.5.5 # Find the latest version here: https://crates.io/crates/cargo-auditable +# renovate: datasource=crate packageName=cargo-auditable ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.4 RUN <