From 4259821aa35463acfbe94f80a85884828a4f1ee3 Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Tue, 4 Mar 2025 14:40:03 +0100 Subject: [PATCH 1/2] chore(deps): remove unix utils from release image --- image/rhel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/rhel/Dockerfile b/image/rhel/Dockerfile index ee6dd3e81fe95..2581e54929a43 100644 --- a/image/rhel/Dockerfile +++ b/image/rhel/Dockerfile @@ -55,7 +55,7 @@ RUN rpm --import RPM-GPG-KEY-CentOS-Official && \ microdnf -y upgrade --nobest && \ rpm -i --nodeps /tmp/postgres-libs.rpm && \ rpm -i --nodeps /tmp/postgres.rpm && \ - microdnf install --setopt=install_weak_deps=0 --nodocs -y lz4 bzip2 util-linux && \ + microdnf install --setopt=install_weak_deps=0 --nodocs -y lz4 bzip2 && \ microdnf clean all -y && \ rm /tmp/postgres.rpm /tmp/postgres-libs.rpm RPM-GPG-KEY-CentOS-Official && \ # (Optional) Remove line below to keep package management utilities From 2f03a6612c1e82b750b741eb67456a86e3cc8749 Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Tue, 4 Mar 2025 13:58:17 +0100 Subject: [PATCH 2/2] chore(image): remove packages with dependecies Signed-off-by: Tomasz Janiszewski --- image/rhel/Dockerfile | 2 +- scanner/image/scanner/Dockerfile | 2 +- scanner/image/scanner/konflux.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/image/rhel/Dockerfile b/image/rhel/Dockerfile index 2581e54929a43..b5cccbe5a523d 100644 --- a/image/rhel/Dockerfile +++ b/image/rhel/Dockerfile @@ -59,7 +59,7 @@ RUN rpm --import RPM-GPG-KEY-CentOS-Official && \ microdnf clean all -y && \ rm /tmp/postgres.rpm /tmp/postgres-libs.rpm RPM-GPG-KEY-CentOS-Official && \ # (Optional) Remove line below to keep package management utilities - rpm -e --nodeps $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \ + rpm -v -e $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' libmodulemd) && \ rm -rf /var/cache/dnf /var/cache/yum && \ # The contents of paths mounted as emptyDir volumes in Kubernetes are saved # by the script `save-dir-contents` during the image build. The directory diff --git a/scanner/image/scanner/Dockerfile b/scanner/image/scanner/Dockerfile index 380d6054fadf2..ccbf5bc6d1bd8 100644 --- a/scanner/image/scanner/Dockerfile +++ b/scanner/image/scanner/Dockerfile @@ -38,7 +38,7 @@ COPY --from=mappings /mappings/repository-to-cpe.json /mappings/container-name-r RUN microdnf upgrade --nobest && \ microdnf clean all && \ # (Optional) Remove line below to keep package management utilities - rpm -e --nodeps $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \ + rpm -v -e $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' libmodulemd) && \ rm -rf /var/cache/dnf /var/cache/yum && \ chown -R 65534:65534 /tmp && \ # The contents of paths mounted as emptyDir volumes in Kubernetes are saved diff --git a/scanner/image/scanner/konflux.Dockerfile b/scanner/image/scanner/konflux.Dockerfile index 075c6b51ffa52..7e2d4e215822b 100644 --- a/scanner/image/scanner/konflux.Dockerfile +++ b/scanner/image/scanner/konflux.Dockerfile @@ -66,7 +66,7 @@ COPY .konflux/scanner-data/repository-to-cpe.json .konflux/scanner-data/containe RUN microdnf upgrade --nobest && \ microdnf clean all && \ # (Optional) Remove line below to keep package management utilities - rpm -e --nodeps $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \ + rpm -v -e $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' libmodulemd) && \ rm -rf /var/cache/dnf /var/cache/yum && \ chown -R 65534:65534 /tmp && \ # The contents of paths mounted as emptyDir volumes in Kubernetes are saved