From e967bdb228a036e38e1fb5ab5288a2f6f15e1b88 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Thu, 27 Aug 2026 08:53:24 +0200
Subject: [PATCH 1/3] chore(stackable-base): Prepare config-utils source
 adjustment

---
 stackable-base/Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 48c879e19..464ae6038 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -17,12 +17,14 @@ RUN <<EOF
 . "$HOME/.cargo/env"
 
 cd /
-git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils
-git clone --depth 1 --branch "containerdebug-${CONTAINERDEBUG_VERSION}" https://github.com/stackabletech/operator-rs
+# Replace with below once https://github.com/stackabletech/operator-rs/pull/1268 is merged. Also experiment with --reference
+git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils config-utils
+# git clone --depth 1 --branch "config-utils-${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/operator-rs config-utils
+git clone --depth 1 --branch "containerdebug-${CONTAINERDEBUG_VERSION}" https://github.com/stackabletech/operator-rs containerdebug
 git clone --depth 1 --branch "cert-tools-${CERT_TOOLS_VERSION}" https://github.com/stackabletech/secret-operator
 cd /config-utils
-cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
-cd /operator-rs
+cargo auditable --quiet build --package config-utils --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
+cd /containerdebug
 cargo auditable --quiet build --package containerdebug --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
 cd /secret-operator
 cargo auditable --quiet build --release --package cert-tools && cargo cyclonedx --all --spec-version 1.5 --describe binaries
@@ -177,8 +179,8 @@ COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /config-utils/config-u
 
 # **containerdebug**
 # Debug tool that logs generic system information.
-COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /operator-rs/target/release/containerdebug /stackable/containerdebug
-COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /operator-rs/crates/containerdebug/containerdebug_bin.cdx.xml /stackable/containerdebug_bin.cdx.xml
+COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /containerdebug/target/release/containerdebug /stackable/containerdebug
+COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /containerdebug/crates/containerdebug/containerdebug_bin.cdx.xml /stackable/containerdebug_bin.cdx.xml
 
 # **cert-tools**
 # A CLI tool to merge two truststores in PEM or PKCS12 format in such as way that they are accepted by the JVM

From 48018ed3b6a054fbbc2b1e4bb53fc34408435843 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Tue, 1 Sep 2026 14:34:21 +0200
Subject: [PATCH 2/3] chore(stackable-base): Bump config-utils to 0.5.0

---
 stackable-base/boil-config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stackable-base/boil-config.toml b/stackable-base/boil-config.toml
index 801384019..355649b17 100644
--- a/stackable-base/boil-config.toml
+++ b/stackable-base/boil-config.toml
@@ -6,7 +6,7 @@ stackable-devel = "1.0.0"
 [versions."1.0.0".build-arguments]
 # Find the latest version here: https://github.com/stackabletech/config-utils/tags
 # renovate: datasource=github-tags packageName=stackabletech/config-utils
-config-utils-version = "0.4.0"
+config-utils-version = "0.5.0"
 
 # Find the latest version here: https://github.com/stackabletech/containerdebug/tags
 # renovate: datasource=github-tags packageName=stackabletech/containerdebug

From b8e4983804153c97efc0fda541166216961c6372 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Tue, 1 Sep 2026 14:34:51 +0200
Subject: [PATCH 3/3] fix(stackable-base): Adjust source URL and path

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

diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 464ae6038..9f5405d30 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -17,9 +17,7 @@ RUN <<EOF
 . "$HOME/.cargo/env"
 
 cd /
-# Replace with below once https://github.com/stackabletech/operator-rs/pull/1268 is merged. Also experiment with --reference
-git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils config-utils
-# git clone --depth 1 --branch "config-utils-${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/operator-rs config-utils
+git clone --depth 1 --branch "config-utils-${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/operator-rs config-utils
 git clone --depth 1 --branch "containerdebug-${CONTAINERDEBUG_VERSION}" https://github.com/stackabletech/operator-rs containerdebug
 git clone --depth 1 --branch "cert-tools-${CERT_TOOLS_VERSION}" https://github.com/stackabletech/secret-operator
 cd /config-utils
@@ -175,7 +173,7 @@ EOF
 # **config-utils**
 # Utility to replace values in a file with values from environment variables and files
 COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /config-utils/target/release/config-utils /stackable/config-utils
-COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /config-utils/config-utils_bin.cdx.xml /stackable/config-utils.cdx.xml
+COPY --from=rust-binaries --chown=${STACKABLE_USER_UID}:0 /config-utils/crates/config-utils/config-utils_bin.cdx.xml /stackable/config-utils.cdx.xml
 
 # **containerdebug**
 # Debug tool that logs generic system information.