From ce322982db7763444df8bbfd0efcd9ce5752f01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= Date: Mon, 11 Nov 2024 15:52:38 +0100 Subject: [PATCH 1/4] Add containerdebug to stackable-base See https://github.com/stackabletech/issues/issues/527 --- stackable-base/Dockerfile | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile index b7184dcc3..ccfb5bd1d 100644 --- a/stackable-base/Dockerfile +++ b/stackable-base/Dockerfile @@ -33,13 +33,28 @@ rm -rf /var/cache/yum 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 + +FROM product-utils-builder AS config-utils +RUN < Date: Mon, 9 Dec 2024 12:49:27 +0100 Subject: [PATCH 2/4] Use released version of containerdebug --- stackable-base/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile index ccfb5bd1d..8a58f63f8 100644 --- a/stackable-base/Dockerfile +++ b/stackable-base/Dockerfile @@ -9,6 +9,9 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:c0e70387664f30cd9cf2795b # 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 +# Find the latest version here: https://github.com/stackabletech/containerdebug/tags +# renovate: datasource=github-tags packageName=stackabletech/containerdebug +ENV CONTAINERDEBUG_VERSION=0.1.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 @@ -46,10 +49,8 @@ EOF FROM product-utils-builder AS containerdebug -# Copying from local folder during development.. -COPY containerdebug containerdebug RUN < Date: Mon, 9 Dec 2024 12:52:18 +0100 Subject: [PATCH 3/4] Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de53bffee..d2f7ce6eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ All notable changes to this project will be documented in this file. ### Added - nifi: Add NiFi hadoop Azure and GCP libraries ([#943]). +- base: Add containerdebug tool ([#928]). +[#928]: https://github.com/stackabletech/docker-images/pull/928 [#943]: https://github.com/stackabletech/docker-images/pull/943 ## [24.11.0] - 2024-11-18 From 5ea24ca4429a4344dc85ddb796056da0a62c86f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= Date: Mon, 9 Dec 2024 13:39:25 +0100 Subject: [PATCH 4/4] Add a motivation comment for containerdebug --- stackable-base/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile index ad6f5e62f..e51a4b1c5 100644 --- a/stackable-base/Dockerfile +++ b/stackable-base/Dockerfile @@ -196,7 +196,11 @@ EOF COPY --from=config-utils --chown=${STACKABLE_USER_UID}:0 /config-utils/target/release/config-utils /stackable/config-utils COPY --from=config-utils --chown=${STACKABLE_USER_UID}:0 /config-utils/config-utils_bin.cdx.xml /stackable/config-utils.cdx.xml + +# **containerdebug** +# Debug tool that logs generic system information. COPY --from=containerdebug --chown=${STACKABLE_USER_UID}:0 /containerdebug/target/release/containerdebug /stackable/containerdebug + ENV PATH="${PATH}:/stackable" # These labels have mostly been superceded by the OpenContainer spec annotations below but it doesn't hurt to include them