@@ -33,13 +33,28 @@ rm -rf /var/cache/yum
3333
3434curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION"
3535. "$HOME/.cargo/env" && cargo --quiet install cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION"
36+ EOF
37+
38+ FROM product-utils-builder AS config-utils
3639
40+ RUN <<EOF
3741git clone --depth 1 --branch "${CONFIG_UTILS_VERSION}" https://github.com/stackabletech/config-utils
3842cd ./config-utils
3943. "$HOME/.cargo/env"
4044cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
4145EOF
4246
47+ FROM product-utils-builder AS containerdebug
48+
49+ # Copying from local folder during development..
50+ COPY containerdebug containerdebug
51+ RUN <<EOF
52+ # git clone --depth 1 https://github.com/stackabletech/containerdebug
53+ cd ./containerdebug
54+ . "$HOME/.cargo/env"
55+ cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
56+ EOF
57+
4358# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
4459# IMPORTANT: Make sure to use the "Manifest List Digest" that references the images for multiple architectures
4560# rather than just the "Image Digest" that references the image for the selected architecture.
@@ -178,8 +193,9 @@ if [ "$(trust list --filter=ca-anchors | grep -c 'E-Tugra')" != "0" ]; then
178193fi
179194EOF
180195
181- COPY --from=product-utils-builder --chown=${STACKABLE_USER_UID}:0 /config-utils/target/release/config-utils /stackable/config-utils
182- COPY --from=product-utils-builder --chown=${STACKABLE_USER_UID}:0 /config-utils/config-utils_bin.cdx.xml /stackable/config-utils.cdx.xml
196+ COPY --from=config-utils --chown=${STACKABLE_USER_UID}:0 /config-utils/target/release/config-utils /stackable/config-utils
197+ COPY --from=config-utils --chown=${STACKABLE_USER_UID}:0 /config-utils/config-utils_bin.cdx.xml /stackable/config-utils.cdx.xml
198+ COPY --from=containerdebug --chown=${STACKABLE_USER_UID}:0 /containerdebug/target/release/containerdebug /stackable/containerdebug
183199ENV PATH="${PATH}:/stackable"
184200
185201# These labels have mostly been superceded by the OpenContainer spec annotations below but it doesn't hurt to include them
0 commit comments