From c03b033a14f82fdc34be3ce8fa62a35d76e1dfff Mon Sep 17 00:00:00 2001 From: Julien Pinsonneau Date: Thu, 22 Jan 2026 12:03:54 +0100 Subject: [PATCH 1/2] use ubi minimal downstream --- Dockerfile.downstream | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Dockerfile.downstream b/Dockerfile.downstream index 7788357d5..b5e518654 100644 --- a/Dockerfile.downstream +++ b/Dockerfile.downstream @@ -35,8 +35,8 @@ RUN USER=netobserv VERSION="$BUILDVERSION" IMAGE="$IMAGE" AGENT_IMAGE="$AGENT_IM # Prepare output dir RUN mkdir -p output -# Create final image from ubi + built binary and command -FROM registry.access.redhat.com/ubi9/ubi:9.7-1764794285 +# Create final image from ubi-minimal + built binary and command +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1768783948 ARG BUILDVERSION ARG BUILDVERSION_Y @@ -47,8 +47,18 @@ COPY --from=builder --chown=65532:65532 /opt/app-root/output /output COPY LICENSE /licenses/ COPY README.downstream ./README +# Copy runtime dependencies from ose-cli (which is based on full RHEL) +# - kubectl & oc: required for CLI operations +# - bash: required for oc-netobserv script execution (#!/usr/bin/env bash) +# - uname: used to display kernel version (cmd/root.go:131) COPY --from=ose-cli /usr/bin/kubectl /usr/bin/kubectl COPY --from=ose-cli /usr/bin/oc /usr/bin/oc +COPY --from=ose-cli /usr/bin/bash /usr/bin/bash +COPY --from=ose-cli /usr/bin/uname /usr/bin/uname + +# Copy bash dependencies (shared libraries) +COPY --from=ose-cli /usr/lib64/libtinfo.so.6 /usr/lib64/ +COPY --from=ose-cli /usr/lib64/libreadline.so.8 /usr/lib64/ USER 65532:65532 From d2a5fdeb3f0d6a473480c08188847252000fa9cb Mon Sep 17 00:00:00 2001 From: Julien Pinsonneau Date: Thu, 22 Jan 2026 12:23:20 +0100 Subject: [PATCH 2/2] remove bash and uname --- Dockerfile.downstream | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Dockerfile.downstream b/Dockerfile.downstream index b5e518654..179e77ea7 100644 --- a/Dockerfile.downstream +++ b/Dockerfile.downstream @@ -46,19 +46,8 @@ COPY --from=builder /opt/app-root/build . COPY --from=builder --chown=65532:65532 /opt/app-root/output /output COPY LICENSE /licenses/ COPY README.downstream ./README - -# Copy runtime dependencies from ose-cli (which is based on full RHEL) -# - kubectl & oc: required for CLI operations -# - bash: required for oc-netobserv script execution (#!/usr/bin/env bash) -# - uname: used to display kernel version (cmd/root.go:131) COPY --from=ose-cli /usr/bin/kubectl /usr/bin/kubectl COPY --from=ose-cli /usr/bin/oc /usr/bin/oc -COPY --from=ose-cli /usr/bin/bash /usr/bin/bash -COPY --from=ose-cli /usr/bin/uname /usr/bin/uname - -# Copy bash dependencies (shared libraries) -COPY --from=ose-cli /usr/lib64/libtinfo.so.6 /usr/lib64/ -COPY --from=ose-cli /usr/lib64/libreadline.so.8 /usr/lib64/ USER 65532:65532