From 81f767dca818912ea7b8ef4c9372c24e8a62e563 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 3 Mar 2025 15:00:15 +0100
Subject: [PATCH 1/4] fix: Bump cargo-cyclonedx to 0.5.7 to support v4
 Cargo.lock format

---
 stackable-base/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 2917ac736..0650b505f 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -18,10 +18,10 @@ ENV CONTAINERDEBUG_VERSION=0.1.1
 ENV RUST_DEFAULT_TOOLCHAIN_VERSION=1.84.1
 # Find the latest version here: https://crates.io/crates/cargo-cyclonedx
 # renovate: datasource=crate packageName=cargo-cyclonedx
-ENV CARGO_CYCLONEDX_CRATE_VERSION=0.5.5
+ENV CARGO_CYCLONEDX_CRATE_VERSION=0.5.7
 # 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
+ENV CARGO_AUDITABLE_CRATE_VERSION=0.6.6
 
 RUN <<EOF
 microdnf update --assumeyes

From 78328beb85e4da69482845bbf19add63fb2ecdc0 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Mon, 3 Mar 2025 16:31:04 +0100
Subject: [PATCH 2/4] chore(stackable-base): Install missing rust toolchains

The behaviour of rustup has recently changed: https://github.com/rust-lang/rustup/pull/3985

Co-authored-by: Techassi <git@techassi.dev>
---
 stackable-base/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 0650b505f..3109ef2b5 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -34,6 +34,7 @@ microdnf --assumeyes install \
 microdnf clean all
 rm -rf /var/cache/yum
 
+# WARNING (@NickLarsenNZ): We should pin the rustup version
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION"
 . "$HOME/.cargo/env" && cargo --quiet install cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION"
 EOF
@@ -44,6 +45,7 @@ RUN <<EOF
 git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils
 cd ./config-utils
 . "$HOME/.cargo/env"
+rustup toolchain install
 cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
 EOF
 
@@ -53,6 +55,7 @@ RUN <<EOF
 git clone --depth 1 --branch "${CONTAINERDEBUG_VERSION}" https://github.com/stackabletech/containerdebug
 cd ./containerdebug
 . "$HOME/.cargo/env"
+rustup toolchain install
 cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
 EOF
 

From 2a2c4bfcd8e3f34972b0d4834481dbc05efc84ab Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Mon, 3 Mar 2025 16:32:11 +0100
Subject: [PATCH 3/4] chore(opa): Install missing rust toolchains

The behaviour of rustup has recently changed: https://github.com/rust-lang/rustup/pull/3985

Co-authored-by: Techassi <git@techassi.dev>
---
 opa/Dockerfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/opa/Dockerfile b/opa/Dockerfile
index a762e731e..1b97bd55d 100644
--- a/opa/Dockerfile
+++ b/opa/Dockerfile
@@ -21,9 +21,15 @@ RUN microdnf update \
 
 WORKDIR /
 
+# WARNING (@NickLarsenNZ): We should pin the rustup version
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 RUN git clone --depth 1 --branch ${BUNDLE_BUILDER_VERSION} https://github.com/stackabletech/opa-bundle-builder
-RUN cd ./opa-bundle-builder && . "$HOME/.cargo/env" && cargo --quiet build --release
+RUN <<EOF
+cd ./opa-bundle-builder
+. "$HOME/.cargo/env"
+rustup toolchain install
+cargo --quiet build --release
+EOF
 
 FROM stackable/image/stackable-base AS multilog-builder
 

From cdfc30ac718936b4b9c5352438673343d91f9829 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Mon, 3 Mar 2025 16:36:15 +0100
Subject: [PATCH 4/4] chore: Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f18a9a86..9ddcbbd5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- stackable-base: Bump cargo-cyclonedx to 0.5.7 ([#1013]).
 - kafka: Bump 3.8.0 to 3.8.1 ([#995]).
 - Update registry references to oci ([#989]).
 - trino-storage-connector: Move the build out of trino/ for easier patching ([#996]).
@@ -52,6 +53,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- stackable-base: Install missing rust toolchains ([#1013]).
+- opa: Install missing rust toolchains ([#1013]).
 - druid: Fix CVE-2023-34455 in Druid `30.0.0` by deleting a dependency ([#935]).
 - hadoop: Fix the JMX exporter configuration for metrics suffixed with
   `_total`, `_info` and `_created` ([#962]).
@@ -84,6 +87,7 @@ All notable changes to this project will be documented in this file.
 [#1005]: https://github.com/stackabletech/docker-images/pull/1005
 [#1006]: https://github.com/stackabletech/docker-images/pull/1006
 [#1007]: https://github.com/stackabletech/docker-images/pull/1007
+[#1013]: https://github.com/stackabletech/docker-images/pull/1013
 
 ## [24.11.1] - 2025-01-14