Remove unneeded packages from final collector image (#1864)

stackrox · Oct 1, 2024 · 8b2d4e6 · 8b2d4e6
1 parent b346e7a
commit 8b2d4e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/collector/container/devel/install.sh b/collector/container/devel/install.sh
@@ -2,4 +2,4 @@
 set -eo pipefail
 
 dnf upgrade -y
-dnf install -y kmod libasan elfutils-libelf
+dnf install -y libasan elfutils-libelf
diff --git a/collector/container/konflux.Dockerfile b/collector/container/konflux.Dockerfile
@@ -106,14 +106,13 @@ COPY ./.konflux /tmp/.konflux
 RUN /tmp/.konflux/scripts/subscription-manager-bro.sh register /mnt && \
     dnf -y --installroot=/mnt upgrade --nobest && \
     dnf -y --installroot=/mnt install --nobest \
-      kmod \
       tbb \
       jq \
       c-ares && \
     /tmp/.konflux/scripts/subscription-manager-bro.sh cleanup && \
     # We can do usual cleanup while we're here: remove packages that would trigger violations. \
     dnf -y --installroot=/mnt clean all && \
-    rpm --root=/mnt --verbose -e --nodeps $(rpm --root=/mnt -qa 'curl' '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \
+    rpm --root=/mnt --verbose -e --nodeps $(rpm --root=/mnt -qa 'curl' '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' 'libyaml*' 'libarchive*') && \
     rm -rf /mnt/var/cache/dnf /mnt/var/cache/yum
 
 

diff --git a/collector/container/rhel/install.sh b/collector/container/rhel/install.sh
@@ -3,8 +3,11 @@ set -eo pipefail
 
 # UBI 9 requires confirmation with -y flag.
 microdnf upgrade -y --nobest
-microdnf install -y kmod findutils elfutils-libelf
+microdnf install -y elfutils-libelf
 
 microdnf clean all
-rpm --query --all 'curl' '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' 'findutils' | xargs -t rpm -e --nodeps
+# shellcheck disable=SC2046
+rpm --verbose -e --nodeps $(
+    rpm -qa 'curl' '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' 'libyaml*' 'libarchive*'
+)
 rm -rf /var/cache/yum